LU-17361 tests: reduce lustre-rsync-test/2a+b workload

The lustre-rsync-test test_2a and test_2b are copying the dbench
output to the local $TMP filesystem twice and can run into memory
allocation issues on VMs where /tmp is a RAM-based filesystem.
The tests are sufficiently verifying lrsync correctness making
a single copy of the dbench output to the local $TMP filesystem.
Other subtests are verifying that multiple '-t DIR' targets work.

Test-Parameters: trivial
Test-Parameters: testlist=lustre-rsync-test env=ONLY=2a,ONLY_MINUTES=60
Test-Parameters: testlist=lustre-rsync-test env=ONLY=2b,ONLY_MINUTES=60
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ibbc720f30c1146c04760f24bc09e1fe76c762edc
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58930
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Rajeev Mishra <rajeevm@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/lustre-rsync-test.sh b/lustre/tests/lustre-rsync-test.sh
index 3caf183..3ae7ab2 100755 (executable)
--- a/lustre/tests/lustre-rsync-test.sh
+++ b/lustre/tests/lustre-rsync-test.sh
@@ -277,16 +277,14 @@ test_2a() {
 
        # Run dbench
        bash rundbench -C -D $DIR/$tdir 2 -t $DBENCH_TIME ||
-               error "dbench failed"
+               error "dbench failed to complete $DBENCH_TIME seconds"
 
-       local LRSYNC_LOG=$(generate_logname "lrsync_log")
+       local log=$(generate_logname "lrsync_log")
        # Replicate the changes to $TGT
-       $LRSYNC -s $DIR -t $TGT -t $TGT2 -m $MDT0 -u $CL_USER -l $LREPL_LOG \
-               -D $LRSYNC_LOG
+       $LRSYNC -s $DIR -t $TGT -m $MDT0 -u $CL_USER -l $LREPL_LOG -D $log
 
        # Use diff to compare the source and the destination
        check_diff $DIR/$tdir $TGT/$tdir
-       check_diff $DIR/$tdir $TGT2/$tdir
 
        fini_changelog
        cleanup_src_tgt
@@ -311,10 +309,9 @@ test_2b() {
        echo Stopping dbench
        stop_procs $child_pid
 
-       local LRSYNC_LOG=$(generate_logname "lrsync_log")
+       local log=$(generate_logname "lrsync_log")
        echo Starting replication
-       $LRSYNC -s $DIR -t $TGT -t $TGT2 -m $MDT0 -u $CL_USER -l $LREPL_LOG \
-               -D $LRSYNC_LOG
+       $LRSYNC -s $DIR -t $TGT -m $MDT0 -u $CL_USER -l $LREPL_LOG -D $log
        check_diff $DIR/$tdir $TGT/$tdir
 
        echo Resuming dbench
@@ -325,7 +322,7 @@ test_2b() {
        stop_procs $child_pid
 
        echo Starting replication
-       $LRSYNC -l $LREPL_LOG -D $LRSYNC_LOG
+       $LRSYNC -l $LREPL_LOG -D $log
        check_diff $DIR/$tdir $TGT/$tdir
 
        echo "Wait for dbench to finish"
@@ -334,10 +331,9 @@ test_2b() {
 
        # Replicate the changes to $TGT
        echo Starting replication
-       $LRSYNC -l $LREPL_LOG -D $LRSYNC_LOG
+       $LRSYNC -l $LREPL_LOG -D $log
 
        check_diff $DIR/$tdir $TGT/$tdir
-       check_diff $DIR/$tdir $TGT2/$tdir
 
        fini_changelog
        cleanup_src_tgt