From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31539 invoked by alias); 1 Apr 2008 21:01:31 -0000 Received: (qmail 31497 invoked by uid 9478); 1 Apr 2008 21:01:29 -0000 Date: Tue, 01 Apr 2008 21:01:00 -0000 Message-ID: <20080401210128.31480.qmail@sourceware.org> From: jbrassow@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-21-gd0aecbf X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: 2114f9e99321008beef4cc18bcbe4aa8712015f9 X-Git-Newrev: d0aecbf552f27bb2bf9d3c66015dd4d8df559dd8 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00001.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d0aecbf552f27bb2bf9d3c66015dd4d8df559dd8 The branch, RHEL4 has been updated via d0aecbf552f27bb2bf9d3c66015dd4d8df559dd8 (commit) from 2114f9e99321008beef4cc18bcbe4aa8712015f9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d0aecbf552f27bb2bf9d3c66015dd4d8df559dd8 Author: Jonathan Brassow Date: Tue Apr 1 15:24:50 2008 -0500 rgmanager/lvm.sh: Fix bug bz242798 Allow a machine to fence itself in the event that it cannot deactivate logical volumes. (The user must explicitly enable this option.) This is useful in cases where one machine in the cluster looses connectivity to its resources, but the others don't. The machine fences itself and the service moves to another machine. ----------------------------------------------------------------------- Summary of changes: rgmanager/src/resources/lvm.metadata | 13 ++++++++++++- rgmanager/src/resources/lvm.sh | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/lvm.metadata b/rgmanager/src/resources/lvm.metadata index 03a5655..61a740b 100755 --- a/rgmanager/src/resources/lvm.metadata +++ b/rgmanager/src/resources/lvm.metadata @@ -39,7 +39,18 @@ If you can see this, your GUI is broken. - + + + + + If set and the clean up of the tags fails, the node will + immediately reboot. + + + Fence the node if it is not able to clean up LVM tags + + + diff --git a/rgmanager/src/resources/lvm.sh b/rgmanager/src/resources/lvm.sh index 6cfb19a..f45e50d 100755 --- a/rgmanager/src/resources/lvm.sh +++ b/rgmanager/src/resources/lvm.sh @@ -293,6 +293,13 @@ lv_activate_and_tag() declare action=$1 declare tag=$2 declare lv_path=$3 + typeset self_fence="" + + case ${OCF_RESKEY_self_fence} in + "yes") self_fence=1 ;; + 1) self_fence=1 ;; + *) self_fence="" ;; + esac if [ -z $action ] || [ -z $tag ] || [ -z $lv_path ]; then ocf_log err "Supplied args: 1) $action, 2) $tag, 3) $lv_path" @@ -314,6 +321,14 @@ lv_activate_and_tag() else ocf_log notice "Deactivating $lv_path" if ! lv_activate_resilient $action $lv_path; then + if [ "$self_fence" ]; then + ocf_log err "Unable to deactivate $lv_path REBOOT" + sync + reboot -fn + else + ocf_log err "Unable to deactivate $lv_path" + fi + ocf_log err "Unable to deactivate $lv_path" return $OCF_ERR_GENERIC fi hooks/post-receive -- Cluster Project