EX-9524 mdt: enable parallel_rename_crossdir

parallel_rename_crossdir was not enabled due to a problem when
porting the following patch.

Fixes: ce01016a4a ("LU-17426 mdt: relax same MDT file rename lock")

The test case that excercise the feature was not run due to
the version check problem when porting the following patch.

Fixes: bc59df8232 ("LU-17426 tests: add crossdir parallel rename test")

Change-Id: I9316c599c6bd24891fbab3484935147d812b6f1c
Signed-off-by: Li Xi <lixi@ddn.com>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54682
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index e52e84f..9d17a16 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -2859,7 +2859,7 @@ static int mdt_reint_rename(struct mdt_thread_info *info,
                      !mdt->mdt_enable_parallel_rename_dir)) ||
                    (!S_ISDIR(ma->ma_attr.la_mode) &&
                     (!mdt->mdt_enable_parallel_rename_file ||
-                     (msrcdir != mtgtdir ||
+                     (msrcdir != mtgtdir &&
                       !mdt->mdt_enable_parallel_rename_crossdir)))) {
                        rc = mdt_rename_lock(info, &rename_lh);
                        if (rc != 0) {

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index a85636a..e1c321b 100755 (executable)
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -4999,8 +4999,8 @@ test_81d() {
        (( pardir == 0 )) || error "considered directory: $pardir"
 
 
-       (( MDS1_VERSION >= $(version_code 2.15.60) )) ||
-               { echo "need MDS >= 2.15.60 for parallel cross-dir"; return 0; }
+       (( MDS1_VERSION >= $(version_code 2.14.0.ddn141) )) ||
+               { echo "need MDS >= 2.14.0.ddn141 for parallel cross-dir"; return 0; }
 
        parfile=$(awk '/parallel_rename_file/ {sum+=$2} END {print sum}' $stats)
        (( parfile == total )) ||