From 522042b3320ab5dd6603b3ee745362bf93bee155 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 26 Apr 2021 10:53:49 -0700 Subject: [PATCH] EX-2882 tests: fix hot-pools.sh issues on single node This patch fixes the following issues while running hot-pools.sh on single node: - sh: warning: here-document at line 0 delimited by end-of-file (wanted `EOF') - lfs changelog_clear: cannot open '/dev/changelog-lustre-MDT0000': No such file or directory (2) Lustre-commit: ab4a750a5138fa9710adc5f196ac820634628c4d Lustre-change: https://review.whamcloud.com/42140 Test-Parameters: trivial testlist=hot-pools,hot-pools Test-Parameters: trivial testgroup=review-dne-part-2 Change-Id: Ie259438c737c9ef4c1fd7148a6cc918177b8fb47 Signed-off-by: Jian Yu Reviewed-by: Andreas Dilger Reviewed-by: Alex Zhuravlev Reviewed-by: John L. Hammond Reviewed-by: Li Xi Reviewed-on: https://review.whamcloud.com/43122 Tested-by: jenkins Tested-by: Maloo --- lustre/tests/hot-pools.sh | 12 ++++++------ lustre/tests/test-framework.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lustre/tests/hot-pools.sh b/lustre/tests/hot-pools.sh index 24c9756..7771d39 100644 --- a/lustre/tests/hot-pools.sh +++ b/lustre/tests/hot-pools.sh @@ -153,6 +153,12 @@ init_lpurge_vars() { } init_hot_pools_env() { + # mount Lustre clients on server nodes + zconf_mount_clients $(comma_list $(all_server_nodes)) $MOUNT || + error "failed to mount Lustre clients on server nodes" + stack_trap "zconf_umount_clients $(comma_list $(all_server_nodes)) \ + $MOUNT" + # enable changelog on MDT(s) changelog_register # create OST pools @@ -160,12 +166,6 @@ init_hot_pools_env() { init_lamigo_vars init_lpurge_vars - - # mount Lustre clients on server nodes - zconf_mount_clients $(comma_list $(all_server_nodes)) $MOUNT || - error "failed to mount Lustre clients on server nodes" - stack_trap "zconf_umount_clients $(comma_list $(all_server_nodes)) \ - $MOUNT" } hot_pools_logfile() { diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index e0fe3d0..6968f21 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -5815,8 +5815,8 @@ check_network() { } no_dsh() { - shift - eval $@ + shift + eval "$@" } # Convert a space-delimited list to a comma-delimited list. If the input is -- 1.8.3.1