cluster: STABLE3 - halvm: Fix bug 506587: lvm agent incorrectly reports vg is in volume_list

Jonathan Brassow jbrassow at fedoraproject.org
Tue May 18 18:20:41 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ee52baabd0eb5f187aa33c794e32e9dfd9e637a3
Commit:        ee52baabd0eb5f187aa33c794e32e9dfd9e637a3
Parent:        b41e5e2a73b8777c26dc51fd1e805bad51eb3203
Author:        Jonathan Brassow <jbrassow at redhat.com>
AuthorDate:    Tue May 18 13:18:53 2010 -0500
Committer:     Jonathan Brassow <jbrassow at redhat.com>
CommitterDate: Tue May 18 13:18:53 2010 -0500

halvm: Fix bug 506587: lvm agent incorrectly reports vg is in volume_list

If the name of the VG controlled by rgmanager is a substring of the name
of the node, the HA-LVM script will complain of an improper setup.

The fix is to also look for the associated quotes that are necessary when
specifying strings in lvm.conf.  Thanks to John Ruemker for the patch.
---
 rgmanager/src/resources/lvm.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/resources/lvm.sh b/rgmanager/src/resources/lvm.sh
index 4b7155c..7f174ca 100644
--- a/rgmanager/src/resources/lvm.sh
+++ b/rgmanager/src/resources/lvm.sh
@@ -47,7 +47,7 @@ function ha_lvm_proper_setup_check
 	# lvm.conf:activation/volume_list; otherwise, machines
 	# will be able to activate the VG regardless of the tags
 	##
-	if lvm dumpconfig activation/volume_list | grep $OCF_RESKEY_vg_name; then
+	if lvm dumpconfig activation/volume_list | grep "\"$OCF_RESKEY_vg_name\""; then
 		ocf_log err "HA LVM:  Improper setup detected"
 		ocf_log err "- $OCF_RESKEY_vg_name found in \"volume_list\" in lvm.conf"
 		return $OCF_ERR_GENERIC


More information about the cluster-commits mailing list