LU-1209 tests: get dir size after rename in sanity 133d

[fs/lustre-release.git] / lustre / tests / sanity.sh

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 36e2aa0..528055b 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7528,22 +7528,24 @@ test_133d() {
     mkdir -p ${testdir2} || error "mkdir failed"
 
     createmany -o $testdir1/test 512 || error "createmany failed"
-    local testdir1_size=$(ls -l $DIR/${tdir} |
-                          awk '/stats_testdir1/ {print $5}')
-    local testdir2_size=$(ls -l $DIR/${tdir} |
-                          awk '/stats_testdir2/ {print $5}')
 
-    testdir1_size=$(order_2 $testdir1_size)
-    testdir2_size=$(order_2 $testdir2_size)
+       # check samedir rename size
+       mv ${testdir1}/test0 ${testdir1}/test_0
 
-    testdir1_size=$(size_in_KMGT $testdir1_size)
-    testdir2_size=$(size_in_KMGT $testdir2_size)
+       local testdir1_size=$(ls -l $DIR/${tdir} |
+               awk '/stats_testdir1/ {print $5}')
+       local testdir2_size=$(ls -l $DIR/${tdir} |
+               awk '/stats_testdir2/ {print $5}')
 
-    echo "source rename dir size: ${testdir1_size}"
-    echo "target rename dir size: ${testdir2_size}"
+       testdir1_size=$(order_2 $testdir1_size)
+       testdir2_size=$(order_2 $testdir2_size)
+
+       testdir1_size=$(size_in_KMGT $testdir1_size)
+       testdir2_size=$(size_in_KMGT $testdir2_size)
+
+       echo "source rename dir size: ${testdir1_size}"
+       echo "target rename dir size: ${testdir2_size}"
 
-    # check samedir rename size
-    mv ${testdir1}/test0 ${testdir1}/test_0
     local cmd="do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats"
     eval $cmd || error "$cmd failed"
     local samedir=$($cmd | grep 'same_dir')
@@ -7556,6 +7558,21 @@ test_133d() {
 
     # check crossdir rename size
     mv ${testdir1}/test_0 ${testdir2}/test_0
+
+       testdir1_size=$(ls -l $DIR/${tdir} |
+               awk '/stats_testdir1/ {print $5}')
+       testdir2_size=$(ls -l $DIR/${tdir} |
+               awk '/stats_testdir2/ {print $5}')
+
+       testdir1_size=$(order_2 $testdir1_size)
+       testdir2_size=$(order_2 $testdir2_size)
+
+       testdir1_size=$(size_in_KMGT $testdir1_size)
+       testdir2_size=$(size_in_KMGT $testdir2_size)
+
+       echo "source rename dir size: ${testdir1_size}"
+       echo "target rename dir size: ${testdir2_size}"
+
     eval $cmd || error "$cmd failed"
     local crossdir=$($cmd | grep 'crossdir')
     local src_sample=$(get_rename_size $testdir1_size)
@@ -9036,10 +9053,10 @@ test_215() { # for bugs 18102, 21079, 21517
        # /proc/sys/lnet/nis should look like this:
        # nid status alive refs peer rtr max tx min
        # where nid is a string like 192.168.1.1@tcp2, status is up/down,
-       # alive is numeric (0 or >0 or <0), refs > 0, peer >= 0,
+       # alive is numeric (0 or >0 or <0), refs >= 0, peer >= 0,
        # rtr >= 0, max >=0, tx and min are numeric (0 or >0 or <0).
        L1="^nid +status +alive +refs +peer +rtr +max +tx +min$"
-       BR="^$NID +(up|down) +$I +$P +$N +$N +$N +$I +$I$"
+       BR="^$NID +(up|down) +$I +$N +$N +$N +$N +$I +$I$"
        create_lnet_proc_files "nis"
        check_lnet_proc_entry "nis.out" "/proc/sys/lnet/nis" "$BR" "$L1"
        check_lnet_proc_entry "nis.sys" "lnet.nis" "$BR" "$L1"