From: Oleg Drokin Date: Mon, 19 Aug 2019 02:56:31 +0000 (-0400) Subject: LU-12672 tests: Correctly determine mdccli in recovery-small test 66 X-Git-Tag: 2.12.90~10 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=fba6abdb9818b01d02ac7663e4ac9881258c8ead LU-12672 tests: Correctly determine mdccli in recovery-small test 66 As is aparently the filtering by awk does not work and we get errors like this: error: get_param: param_path 'lustre-MDT0001-mdc-ffff880114af9800/mds_conn_uuid': No such file or directory error: set_param: param_path 'mdc/lustre-MDT0000-mdc-ffff880114af9800 lustre-MDT0001-mdc-ffff880114af9800/import': No such file or directory Test-Parameters: trivial testlist=recovery-small Change-Id: Ibbcc79f71d2fa5966da90f0c8d0e98a3c5f2a964 Signed-off-by: Oleg Drokin Reviewed-on: https://review.whamcloud.com/35827 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Nunez --- diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 0ce0509..891ac23 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -1583,7 +1583,8 @@ test_66() do_nodes $list $LCTL set_param fail_loc=0x80000136 #initiate the re-connect & re-send - local mdccli=$($LCTL dl | awk '/-MDT0000-mdc-/ {print $4;}') + local mdtname="MDT0000" + local mdccli=$($LCTL dl | grep "${mdtname}-mdc" | awk '{print $4;}') local conn_uuid=$($LCTL get_param -n mdc.${mdccli}.conn_uuid) $LCTL set_param "mdc.${mdccli}.import=connection=${conn_uuid}" sleep 2