cluster: STABLE3 - rgmanager: halvm: Check ownership before stripping tags

Lon Hohberger lon at fedoraproject.org
Mon Jan 25 23:04:36 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c6df45775f8a255b928b839a8c0201c631c8c811
Commit:        c6df45775f8a255b928b839a8c0201c631c8c811
Parent:        8d7b996436d4b65dbf2f0a5532460660d9347406
Author:        Jonathan E. Brassow <jbrassow at redhat.com>
AuthorDate:    Mon Jan 25 17:56:41 2010 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Mon Jan 25 18:04:28 2010 -0500

rgmanager: halvm: Check ownership before stripping tags

Resolves: rhbz#557167

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/resources/lvm_by_lv.sh |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/rgmanager/src/resources/lvm_by_lv.sh b/rgmanager/src/resources/lvm_by_lv.sh
index 2c6262f..54e67bf 100644
--- a/rgmanager/src/resources/lvm_by_lv.sh
+++ b/rgmanager/src/resources/lvm_by_lv.sh
@@ -199,6 +199,15 @@ lv_activate_and_tag()
 			ocf_log err "Unable to delete tag from $lv_path"
 			return $OCF_ERR_GENERIC
 		fi
+
+		if [ `lvs --noheadings -o lv_tags $lv_path` == $tag ]; then
+			ocf_log notice "Removing ownership tag ($tag) from $lv_path"
+			lvchange --deltag $tag $lv_path
+			if [ $? -ne 0 ]; then
+				ocf_log err "Unable to delete tag from $lv_path"
+				return $OCF_ERR_GENERIC
+			fi
+		fi
 	fi
 
 	return $OCF_SUCCESS


More information about the cluster-commits mailing list