From: Alexandre Ioffe Date: Thu, 14 Sep 2023 01:07:14 +0000 (-0700) Subject: EX-8232 test: use client machines additionally to OSS X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=11d00d05e7dd383c78220b90833c0621bece23d9;p=fs%2Flustre-release.git EX-8232 test: use client machines additionally to OSS Additionally to OSS nodes add replication agents to client nodes. This makes possible testing lamigo replications on large number of nodes. Test-Parameters: testlist=hot-pools Signed-off-by: Alexandre Ioffe Change-Id: I980f95a4885991faf7d958e98fdbc7811fb1f163 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/52368 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Alex Zhuravlev Reviewed-by: Jian Yu Reviewed-by: Andreas Dilger --- diff --git a/lustre/tests/hot-pools.sh b/lustre/tests/hot-pools.sh index 599cac9..2674a94 100755 --- a/lustre/tests/hot-pools.sh +++ b/lustre/tests/hot-pools.sh @@ -63,6 +63,8 @@ LAMIGO_TIMESTAMPS=${LAMIGO_TIMESTAMPS:-true} LAMIGO_VERBOSE=${LAMIGO_VERBOSE:-false} LAMIGO_DUMP=${LAMIGO_DUMP:-""} LAMIGO_EXTRA=${LAMIGO_EXTRA:-""} +LAMIGO_CLIENTS=${CLIENTS:-"$HOSTNAME"} +LAMIGO_CLIENTS=${LAMIGO_CLIENTS//,/ } declare -a LAMIGO_MDT declare -a LAMIGO_MDT_FACET @@ -262,7 +264,7 @@ start_one_lamigo_cmd() { cmd+=${mdt:+" -m $mdt"} cmd+=${LAMIGO_MOUNT:+" -M $LAMIGO_MOUNT"} - for node in $LAMIGO_AGT_NODES; do + for node in $LAMIGO_CLIENTS $LAMIGO_AGT_NODES; do cmd+=" -g $node:$LAMIGO_MOUNT:$LAMIGO_AGT_JOBS" done @@ -337,7 +339,7 @@ create_one_lamigo_cfg() { echo mdt=\\\"$mdt\\\" > $cfg_file; [[ -z \\\"$LAMIGO_MOUNT\\\" ]] || echo mount=\\\"$LAMIGO_MOUNT\\\" >> $cfg_file; - for node in $LAMIGO_AGT_NODES; do + for node in $LAMIGO_CLIENTS $LAMIGO_AGT_NODES; do echo agent=\\\$node:$LAMIGO_MOUNT:$LAMIGO_AGT_JOBS >> \ $cfg_file; done; @@ -1098,21 +1100,21 @@ test_5() { init_hot_pools_env LAMIGO_MDT= LAMIGO_MOUNT= LAMIGO_SRC= LAMIGO_TGT= LAMIGO_AGE= \ - LAMIGO_USR= LAMIGO_AGT_NODES= start_one_lamigo_cmd + LAMIGO_USR= LAMIGO_CLIENTS= LAMIGO_AGT_NODES= start_one_lamigo_cmd ! check_one_lamigo_is_started || { stop_one_lamigo_cmd error "start lamigo with no parameters should fail" } LAMIGO_MDT= LAMIGO_SRC= LAMIGO_TGT= LAMIGO_AGE= \ - LAMIGO_USR= LAMIGO_AGT_NODES= start_one_lamigo_cmd + LAMIGO_USR= LAMIGO_CLIENTS= LAMIGO_AGT_NODES= start_one_lamigo_cmd ! check_one_lamigo_is_started || { stop_one_lamigo_cmd error "start lamigo with only '-M' option should fail" } LAMIGO_SRC= LAMIGO_TGT= LAMIGO_AGE= \ - LAMIGO_USR= LAMIGO_AGT_NODES= start_one_lamigo_cmd + LAMIGO_USR= LAMIGO_CLIENTS= LAMIGO_AGT_NODES= start_one_lamigo_cmd ! check_one_lamigo_is_started || { stop_one_lamigo_cmd error "start lamigo with only '-M' and '-m' options should fail" @@ -1131,7 +1133,7 @@ test_5() { } # EX-1986 lamigo: let lamigo start w/o alive agents - LAMIGO_AGT_NODES=foo start_one_lamigo_cmd + LAMIGO_CLIENTS= LAMIGO_AGT_NODES=foo start_one_lamigo_cmd check_one_lamigo_is_started || error "start lamigo with bad '-g' option should not fail" stop_one_lamigo_cmd @@ -1251,7 +1253,7 @@ test_7() { local facet=${LAMIGO_MDT_FACET[0]} local log_file=$(lamigo_logfile $facet) - LAMIGO_AGT_NODES="$(facet_active_host ost1)" \ + LAMIGO_CLIENTS= LAMIGO_AGT_NODES="$(facet_active_host ost1)" \ LAMIGO_SRC= LAMIGO_TGT= start_one_lamigo_cmd check_one_lamigo_is_started || error "failed to start lamigo" stack_trap stop_one_lamigo_cmd