Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=dca24557dceec6... Commit: dca24557dceec608a0e5a36efcc1005fd03f4549 Parent: 333c81daefc33284815471e8f8069cd91981d181 Author: Ryan McCabe rmccabe@redhat.com AuthorDate: Tue Oct 8 14:39:15 2013 -0400 Committer: Ryan McCabe rmccabe@redhat.com CommitterDate: Wed Oct 9 00:45:27 2013 -0400
rgmanager: HA-LVM: strip spaces in lvm -o tags output
Remove whitespace from 'lvm -o tags' output that caused status checks to fail.
Resolves: rhbz#1016957
Patch from John Ruemker jruemker@redhat.com Signed-off-by: Ryan McCabe rmccabe@redhat.com --- rgmanager/src/resources/lvm_by_lv.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rgmanager/src/resources/lvm_by_lv.sh b/rgmanager/src/resources/lvm_by_lv.sh index d47b923..c32f988 100644 --- a/rgmanager/src/resources/lvm_by_lv.sh +++ b/rgmanager/src/resources/lvm_by_lv.sh @@ -238,7 +238,7 @@ lv_status_single() # # Verify that we are the correct owner # - owner=`lvs -o tags --noheadings $lv_path` + owner=`lvs -o tags --noheadings $lv_path | tr -d ' '` my_name=$(local_node_name) if [ -z "$my_name" ]; then ocf_log err "Unable to determine local machine name" @@ -364,7 +364,7 @@ lv_activate_and_tag() lv_activate() { declare lv_path="$OCF_RESKEY_vg_name/$OCF_RESKEY_lv_name" - declare owner=`lvs -o tags --noheadings $lv_path` + declare owner=`lvs -o tags --noheadings $lv_path | tr -d ' '` declare my_name=$(local_node_name) local owned
@@ -395,7 +395,7 @@ lv_activate() "activation { volume_list = "$OCF_RESKEY_vg_name" }" \ $OCF_RESKEY_vg_name; then ocf_log notice "$OCF_RESKEY_vg_name now consistent" - owner=`lvs -o tags --noheadings $lv_path` + owner=`lvs -o tags --noheadings $lv_path | tr -d ' '` lv_owner $my_name $owner owned=$? if [ ! -z "$owner" ] && [ $owned -eq 2 ]; then