Whamcloud - gitweb
LU-7082 test: fix synchronization of conf_sanity test_90 15/16215/6
authorGregoire Pichon <gregoire.pichon@bull.net>
Thu, 3 Sep 2015 12:04:34 +0000 (14:04 +0200)
committerOleg Drokin <oleg.drokin@intel.com>
Wed, 7 Oct 2015 17:39:49 +0000 (17:39 +0000)
Add some delays in check_max_mod_rpcs_in_flight() routine
to ensure background commands are launched before continuing
test execution.

Signed-off-by: Gregoire Pichon <gregoire.pichon@bull.net>
Change-Id: Ia1c943b7b58ecfe4f3fd80d6470a8ee2650789e7
Reviewed-on: http://review.whamcloud.com/16215
Tested-by: Jenkins
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/tests/conf-sanity.sh

index 49a4756..4c6d347 100644 (file)
@@ -5774,6 +5774,7 @@ check_max_mod_rpcs_in_flight() {
        for i in $(seq $((mmr - 1))); do
                chmod 0600 $dir/file-$i &
        done
+       sleep 1
 
        # send one additional modify RPC
        do_facet $facet "$LCTL set_param fail_loc=0"
@@ -5798,6 +5799,7 @@ check_max_mod_rpcs_in_flight() {
        for i in $(seq $mmr); do
                chmod 0666 $dir/file-$i &
        done
+       sleep 1
 
        # send one additional modify RPC
        do_facet $facet "$LCTL set_param fail_loc=0"
@@ -5807,7 +5809,7 @@ check_max_mod_rpcs_in_flight() {
 
        # check this additional modify RPC blocked getting a modify RPC slot
        checkstat -vp 0644 $dir/file-$((mmr + 1)) ||
-               error "Unexpectedly send $mmr modify RPCs in parallel"
+               error "Unexpectedly send $(($mmr + 1)) modify RPCs in parallel"
        wait
 }