From bea7933257d8c368057988b98c8885bb7a75e812 Mon Sep 17 00:00:00 2001 From: Sergey Cheremencev Date: Mon, 17 Apr 2023 17:44:22 +0300 Subject: [PATCH] LU-16168 tests: fix get_slave_nr in sanity-quota Redirect output of wait_update_facet in get_slave_nr to /dev/null/. Otherwise if wait_update_cond prints something while waiting, get_slave_nr returns this output together with slave number causing test_68 to fail. Lustre-change: https://review.whamcloud.com/50659 Lustre-commit: 2e5941f94e496559235fa568b48ed03954db2dba Test-Parameters: trivial testlist=sanity-quota Test-Parameters: testlist=sanity-quota fstype=zfs Fixes: 83dd308db5 ("LU-15460 test: wait quota pool to be prepared") Signed-off-by: Sergey Cheremencev Change-Id: I813ed31db864897372c7eb6aab4e1f5a4b955f49 Reviewed-by: Hongchao Zhang Reviewed-by: Andreas Dilger Signed-off-by: Etienne AUJAMES Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51576 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/sanity-quota.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 5b9ede2..b24f07a 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -4536,7 +4536,7 @@ get_slave_nr() { wait_update_facet mds1 \ "$LCTL get_param -n qmt.$FSNAME-QMT0000.dt-$pool.info \ - >/dev/null 2>&1 || echo foo" "" || + >/dev/null 2>&1 || echo foo" "">/dev/null || error "mds1: failed to create quota pool $pool" do_facet mds1 $LCTL get_param -n qmt.$FSNAME-QMT0000.dt-$pool.info | -- 1.8.3.1