Change in vdsm[master]: safelease: Fix wrong parameter name

nsoffer at redhat.com nsoffer at redhat.com
Wed Sep 9 19:47:11 UTC 2015


Nir Soffer has uploaded a new change for review.

Change subject: safelease: Fix wrong parameter name
......................................................................

safelease: Fix wrong parameter name

smpstop.sh expects a storage domain uuid, not a pool id. Updat the
variables names, the online help and the logs.

Change-Id: I2a0a7f6f60fae8d7833a679069f6de865d82d79b
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M vdsm/storage/protect/spmstop.sh
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/60/45960/1

diff --git a/vdsm/storage/protect/spmstop.sh b/vdsm/storage/protect/spmstop.sh
index fc707e1..9a8e622 100755
--- a/vdsm/storage/protect/spmstop.sh
+++ b/vdsm/storage/protect/spmstop.sh
@@ -21,15 +21,15 @@
 
 LOGFILE="/var/log/vdsm/spm-lock.log"
 KILL="/bin/kill"
-spUUID="$1"
+sdUUID="$1"
 DEBUG="$2"
 
 function usage() {
     if [ -n "$1" ]; then
         echo $1
     fi
-    echo "usage: $0 { spUUID }"
-    echo "  spUUID -                pool uuid"
+    echo "usage: $0 { sdUUID }"
+    echo "  sdUUID - storage domain uuid"
     exit 1
 }
 
@@ -51,7 +51,7 @@
 fi
 
 spmprotect_pgrps=$(
-    ps -o pgrp= -o cmd= -C spmprotect.sh | grep renew | grep "$spUUID" | \
+    ps -o pgrp= -o cmd= -C spmprotect.sh | grep renew | grep "$sdUUID" | \
 	awk '{ print -$1 }' | sort -n | uniq
 )
 spmprotect_pgrps_len=$(echo $spmprotect_pgrps | wc -w)
@@ -60,7 +60,7 @@
     debug "No process found to kill"
     exit 0
 else
-    log "Stopping lease for pool: $spUUID pgrps: $spmprotect_pgrps"
+    log "Stopping lease for domain: $sdUUID pgrps: $spmprotect_pgrps"
     $KILL -USR1 -- $spmprotect_pgrps >/dev/null 2>&1
 fi
 


-- 
To view, visit https://gerrit.ovirt.org/45960
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a0a7f6f60fae8d7833a679069f6de865d82d79b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>


More information about the vdsm-patches mailing list