EX-4101 lipe: fix default POOL name

* set default valuies before using them

Test-Parameters: trivial

Change-Id: I69e3176b8f469f1bb0510e10e88e7f2843ee98b3
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/45315
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Tested-by: Jian Yu <yujian@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/lipe/scripts/stratagem-hp-config.sh b/lipe/scripts/stratagem-hp-config.sh
index 07fa775..47bbe37 100755 (executable)
--- a/lipe/scripts/stratagem-hp-config.sh
+++ b/lipe/scripts/stratagem-hp-config.sh
@@ -139,6 +139,14 @@ if $AUTO; then
     AUTO_LAMIGO_MINAGE=$(awk -F = '/^min-age=/{ print $2 }' /etc/lamigo/$FS-MDT0000.conf)
 fi
 
+# Set value: if not explicitly set, set auto, if no auto, set default
+: ${FAST_POOL:=${AUTO_FAST_POOL:-${DEF_FAST_POOL}}}
+: ${FAST_POOL_SPILL_THRESHOLD_PCT:=${DEF_FAST_POOL_SPILL_THRESHOLD_PCT}}
+: ${SLOW_POOL:=${AUTO_SLOW_POOL:-${DEF_SLOW_POOL}}}
+: ${LAMIGO_MINAGE:=${AUTO_LAMIGO_MINAGE:-${DEF_LAMIGO_MINAGE}}}
+: ${LPURGE_FREEHI:=${AUTO_LPURGE_FREEHI:-${DEF_LPURGE_FREEHI}}}
+: ${LPURGE_FREELO:=${AUTO_LPURGE_FREELO:-${DEF_LPURGE_FREELO}}}
+
 # List of %04x formated OST indexes
 FAST_OSTLIST=$(ssh $MDSHOST lctl pool_list $FS.$FAST_POOL|sed -ne 's/.*-OST\(....\)_UUID/\1/p')
 if [ -z "$FAST_OSTLIST" ]; then
@@ -163,14 +171,6 @@ if $AUTO; then
     done
 fi
 
-# Set value: if not explicitly set, set auto, if no auto, set default
-: ${FAST_POOL:=${AUTO_FAST_POOL:-${DEF_FAST_POOL}}}
-: ${FAST_POOL_SPILL_THRESHOLD_PCT:=${DEF_FAST_POOL_SPILL_THRESHOLD_PCT}}
-: ${SLOW_POOL:=${AUTO_SLOW_POOL:-${DEF_SLOW_POOL}}}
-: ${LAMIGO_MINAGE:=${AUTO_LAMIGO_MINAGE:-${DEF_LAMIGO_MINAGE}}}
-: ${LPURGE_FREEHI:=${AUTO_LPURGE_FREEHI:-${DEF_LPURGE_FREEHI}}}
-: ${LPURGE_FREELO:=${AUTO_LPURGE_FREELO:-${DEF_LPURGE_FREELO}}}
-
 if ! is_valid_percent "${LPURGE_FREEHI}"; then
     echo "Invalid FREEHI percentage '${LPURGE_FREEHI}'"
     usage 34
@@ -181,7 +181,7 @@ if ! is_valid_percent "${LPURGE_FREELO}"; then
     usage 34
 fi
 
-if ! is_valid_percent "%{FAST_POOL_SPILL_THRESHOLD_PCT}"; then
+if ! is_valid_percent "${FAST_POOL_SPILL_THRESHOLD_PCT}"; then
     echo "Invalid FAST_POOL_SPILL_THRESHOLD_PCT percentage '${FAST_POOL_SPILL_THRESHOLD_PCT}'"
     usage 34
 fi