From 7921d0d8db942057eb10042291d6d90448e5c197 Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Tue, 12 Sep 2017 22:58:07 -0700 Subject: [PATCH] LU-9980 tests: save specific facet in save_lustre_params() In save_lustre_params(), while there are multiple server facets having the same host, and the parameter has wildcard, duplicate parameters with wrong facets will be saved. This patch fixes the above issue by greping service name to save the parameter with specific facet. Test-Parameters: clientcount=4 osscount=2 mdscount=2 mdtcount=1 \ austeroptions=-R failover=true iscsi=1 testlist=replay-vbr Change-Id: Icba3fc532f4c67f02272c39e8e64d49325dad0e7 Signed-off-by: Elena Gryaznova Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/28963 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index f302656..c020375 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -6245,16 +6245,17 @@ calc_osc_kbytes () { save_lustre_params() { local facets=$1 local facet - local nodes - local node + local facet_svc for facet in ${facets//,/ }; do - node=$(facet_active_host $facet) - [[ *\ $node\ * = " $nodes " ]] && continue - nodes="$nodes $node" - - do_node $node "$LCTL get_param $2 | - while read s; do echo $facet \\\$s; done" + facet_svc=$(facet_svc $facet) + do_facet $facet \ + "params=\\\$($LCTL get_param $2); + [[ -z \\\"$facet_svc\\\" ]] && param= || + param=\\\$(grep $facet_svc <<< \\\"\\\$params\\\"); + [[ -z \\\$param ]] && param=\\\"\\\$params\\\"; + while read s; do echo $facet \\\$s; + done <<< \\\"\\\$param\\\"" done } -- 1.8.3.1