From 3b92a89561d2124b54a8fe6e5519200e27fc4523 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Thu, 9 Dec 2021 10:00:16 -0600 Subject: [PATCH] EX-4265 lipe: fix automated lpurge configuration In stratagem-hp-config.sh, delay setting LPURGE_FREEHI until the automatic values have been determined. Test-Parameters: trivial Signed-off-by: John L. Hammond Change-Id: I3042061cf0f2da8e807a3ed2acc527cb9517385b Reviewed-on: https://review.whamcloud.com/45810 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Gaurang Tapase Reviewed-by: Nathaniel Clark Reviewed-on: https://review.whamcloud.com/46128 --- lipe/scripts/stratagem-hp-config.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lipe/scripts/stratagem-hp-config.sh b/lipe/scripts/stratagem-hp-config.sh index 47bbe37..ae8dc12 100755 --- a/lipe/scripts/stratagem-hp-config.sh +++ b/lipe/scripts/stratagem-hp-config.sh @@ -144,8 +144,6 @@ fi : ${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') @@ -171,6 +169,9 @@ if $AUTO; then done fi +: ${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 -- 1.8.3.1