From e83569da38138859a51c660dfb5ca5bf45c70a37 Mon Sep 17 00:00:00 2001 From: Henri Doreau Date: Fri, 6 Feb 2015 10:01:36 +0100 Subject: [PATCH] LU-7073 tests: Add file migration to racer Make racer run both blocking and non-blocking "lfs migrate" commands. Implement this within the file_create.sh script, since it is already selecting among different layout types. Update Makefile.am to avoid listing every racer filename explicitly to make it easier to add new types of operations in the future. Test-Parameters: trivial testlist=racer,racer,racer Test-Parameters: fstype=zfs testlist=racer,racer,racer Signed-off-by: Henri Doreau Signed-off-by: Jinshan Xiong Change-Id: I51b3f19c78029ff47102e96a71ec4a0fc472183a Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/13669 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Zhenyu Xu Reviewed-by: Alex Deiter Reviewed-by: Oleg Drokin --- lustre/tests/Makefile.am | 8 +------- lustre/tests/racer.sh | 2 ++ lustre/tests/racer/file_create.sh | 9 +++++++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am index 20e2559..49e2799 100644 --- a/lustre/tests/Makefile.am +++ b/lustre/tests/Makefile.am @@ -47,13 +47,7 @@ noinst_SCRIPTS += sanity-dom.sh sanity-pcc.sh dom-performance.sh sanity-lnet.sh nobase_noinst_SCRIPTS = cfg/local.sh nobase_noinst_SCRIPTS += test-groups/regression test-groups/regression-mpi nobase_noinst_SCRIPTS += acl/make-tree acl/run cfg/ncli.sh -nobase_noinst_SCRIPTS += racer/dir_create.sh racer/file_create.sh racer/file_list.sh -nobase_noinst_SCRIPTS += racer/file_rm.sh racer/racer.sh racer/file_concat.sh racer/file_exec.sh -nobase_noinst_SCRIPTS += racer/file_link.sh racer/file_rename.sh racer/file_symlink.sh -nobase_noinst_SCRIPTS += racer/dir_remote.sh racer/dir_migrate.sh racer/file_chmod.sh -nobase_noinst_SCRIPTS += racer/file_chown.sh racer/file_delxattr.sh racer/file_getxattr.sh -nobase_noinst_SCRIPTS += racer/file_mknod.sh racer/file_setxattr.sh racer/file_truncate.sh -nobase_noinst_SCRIPTS += racer/lss_create.sh racer/lss_destroy.sh +nobase_noinst_SCRIPTS += racer/*.sh nobase_noinst_SCRIPTS += posix/posix.cfg nobase_noinst_DATA = acl/cp.test acl/getfacl-noacl.test acl/inheritance.test nobase_noinst_DATA += acl/misc.test acl/permissions.test acl/setfacl.test diff --git a/lustre/tests/racer.sh b/lustre/tests/racer.sh index a0cd2e0..760a217 100644 --- a/lustre/tests/racer.sh +++ b/lustre/tests/racer.sh @@ -68,6 +68,7 @@ RACER_ENABLE_REMOTE_DIRS=${RACER_ENABLE_REMOTE_DIRS:-false} RACER_ENABLE_STRIPED_DIRS=${RACER_ENABLE_STRIPED_DIRS:-false} RACER_ENABLE_MIGRATION=${RACER_ENABLE_MIGRATION:-false} RACER_ENABLE_SNAPSHOT=${RACER_ENABLE_SNAPSHOT:-true} +RACER_ENABLE_FILE_MIGRATE=${RACER_ENABLE_FILE_MIGRATE:-true} RACER_ENABLE_PFL=${RACER_ENABLE_PFL:-true} RACER_ENABLE_DOM=${RACER_ENABLE_DOM:-true} RACER_ENABLE_FLR=${RACER_ENABLE_FLR:-true} @@ -134,6 +135,7 @@ test_1() { RACER_ENABLE_REMOTE_DIRS=$RACER_ENABLE_REMOTE_DIRS \ RACER_ENABLE_STRIPED_DIRS=$RACER_ENABLE_STRIPED_DIRS \ RACER_ENABLE_MIGRATION=$RACER_ENABLE_MIGRATION \ + RACER_ENABLE_FILE_MIGRATE=$RACER_ENABLE_FILE_MIGRATE \ RACER_ENABLE_PFL=$RACER_ENABLE_PFL \ RACER_ENABLE_DOM=$RACER_ENABLE_DOM \ RACER_ENABLE_FLR=$RACER_ENABLE_FLR \ diff --git a/lustre/tests/racer/file_create.sh b/lustre/tests/racer/file_create.sh index adde78b..12e69e8 100755 --- a/lustre/tests/racer/file_create.sh +++ b/lustre/tests/racer/file_create.sh @@ -51,6 +51,15 @@ while /bin/true; do extra) opt="setstripe $RACER_EXTRA_LAYOUT" ;; esac + if $RACER_ENABLE_FILE_MIGRATE && (( RANDOM % 20 == 0 )); then + if [ "$pattern" = "flr" ]; then + # LU-13730 crashes server when adding mirror + : # opt=${opt/create/extend} + else + opt=${opt/setstripe/migrate} + (( file % 8 == 0 )) && opt+=" --block" + fi + fi $LFS $opt $DIR/$file 2> /dev/null || true } -- 1.8.3.1