tests: increase sleeps from 1s to 2s

The issue here is that some of the tests sporadically fail due to things
being still processed. Default 1s delays proven not to be sufficient for
newly created CI, as tests tend to ocassionally fail.

This patch increases default 1s sleep to 2s, to hopefully get rid of
sporadical fails.

Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>

26 files changed, 47 insertions, 47 deletions

diff --git a/clustermd_tests/01r10_Grow_bitmap-switch b/clustermd_tests/01r10_Grow_bitmap-switch
index 17947198..89757681 100644
--- a/clustermd_tests/01r10_Grow_bitmap-switch
+++ b/clustermd_tests/01r10_Grow_bitmap-switch
@@ -19,7 +19,7 @@ check all nobitmap
 mdadm --grow $md0 --bitmap=internal
 [ $? -eq '0' ] ||
 	die "$NODE1: change bitmap 'none' to 'internal' failed."
-sleep 1
+sleep 2
 mdadm -X $dev0 $dev1 &> /dev/null
 [ $? -eq '0' ] ||
 	die "$NODE1: create 'internal' bitmap failed."
@@ -37,7 +37,7 @@ mdadm --grow $md0 --bitmap=clustered
 [ $? -eq '0' ] ||
 	die "$NODE1: change bitmap 'none' to 'clustered' failed."
 ssh $NODE2 mdadm -A $md0 $dev0 $dev1
-sleep 1
+sleep 2
 for ip in $NODES
 do
 	ssh $ip "mdadm -X $dev0 $dev1 | grep -q 'Cluster name'" ||
diff --git a/clustermd_tests/func.sh b/clustermd_tests/func.sh
index e659c0ba..ea156836 100644
--- a/clustermd_tests/func.sh
+++ b/clustermd_tests/func.sh
@@ -85,7 +85,7 @@ check_dlm()
 		crm configure clone base-clone base-group \
 			meta interleave=true
 	fi
-	sleep 1
+	sleep 2
 	for ip in $NODE1 $NODE2
 	do
 		ssh $ip "pgrep dlm_controld > /dev/null" || {
diff --git a/misc/mdcheck b/misc/mdcheck
index f87999d3..5f068121 100644
--- a/misc/mdcheck
+++ b/misc/mdcheck
@@ -147,7 +147,7 @@ do
 		systemctl stop mdcheck_continue.timer
 		exit 0;
 	fi
-	sleep 120
+	sleep 220
 done
 
 # We've waited, and there are still checks running.
diff --git a/tests/01r1fail b/tests/01r1fail
index 389b813f..f078d195 100644
--- a/tests/01r1fail
+++ b/tests/01r1fail
@@ -8,7 +8,7 @@ check resync
 mdadm $md0 --fail $dev2
 check resync
 mdadm $md0 --fail $dev1
-sleep 1
+sleep 2
 check nosync
 check state U___
 mdadm $md0 --add $dev4 $dev3
diff --git a/tests/01replace b/tests/01replace
index 6223a223..67e411f8 100644
--- a/tests/01replace
+++ b/tests/01replace
@@ -33,7 +33,7 @@ do
 
   mdadm $md0 --add $dev1 $dev5
   mdadm $md0 --replace $dev0
-  sleep 1
+  sleep 2
   mdadm $md0 --fail $dev2
   check wait
   sum2=`sha1sum < $md0`
@@ -42,7 +42,7 @@ do
   mdadm $md0 --remove $dev0 $dev2
   mdadm $md0 --add $dev0 $dev2
   mdadm $md0 --replace $dev3
-  sleep 1
+  sleep 2
   mdadm $md0 --fail $dev0 $dev2
   check wait
   sum3=`sha1sum < $md0`
diff --git a/tests/05r1-re-add b/tests/05r1-re-add
index 4fc263f5..d2f45747 100644
--- a/tests/05r1-re-add
+++ b/tests/05r1-re-add
@@ -12,14 +12,14 @@ testdev $md0 1 $mdsize1a 64
 sleep 6
 
 mdadm $md0 -f $dev2
-sleep 1
+sleep 2
 mdadm $md0 -r $dev2
 mdadm $md0 -a $dev2
 #cat /proc/mdstat
 check nosync
 
 mdadm $md0 -f $dev2
-sleep 1
+sleep 2
 mdadm $md0 -r $dev2
 testdev $md0 1 $mdsize1a 64
 mdadm $md0 -a $dev2
@@ -27,7 +27,7 @@ check wait
 blockdev --flushbufs $dev1 $dev2
 cmp --ignore-initial=$[64*512] --bytes=$[$mdsize0*1024] $dev1 $dev2
 
-mdadm $md0 -f $dev2; sleep 1
+mdadm $md0 -f $dev2; sleep 2
 mdadm $md0 -r $dev2
 if dd if=/dev/zero of=$md0 ; then : ; fi
 blockdev --flushbufs $md0 # ensure writes have been sent.
diff --git a/tests/05r1-re-add-nosuper b/tests/05r1-re-add-nosuper
index f243e4aa..296759f7 100644
--- a/tests/05r1-re-add-nosuper
+++ b/tests/05r1-re-add-nosuper
@@ -3,14 +3,14 @@
 # readd should fail.
 #
 mdadm -B $md0 -l1 -n2 -d1 $dev1 $dev2
-sleep 1
+sleep 2
 check resync
 check wait
 testdev $md0 1 $size 1
 sleep 6
 
 mdadm $md0 -f $dev2
-sleep 1
+sleep 2
 mdadm $md0 -r $dev2
 if mdadm $md0 --re-add $dev2; then
 	err "re-add should fail"
diff --git a/tests/05r6tor0 b/tests/05r6tor0
index b2685b72..0d8e32be 100644
--- a/tests/05r6tor0
+++ b/tests/05r6tor0
@@ -4,28 +4,28 @@ set -x -e
 # then reshape back up to RAID5 and RAID5
 
 mdadm -CR $md0 -l6 -n5 $dev0 $dev1 $dev2 $dev3 $dev4
-check wait; sleep 1
+check wait; sleep 2
 check raid6
 testdev $md0 3 19456 512
 mdadm -G $md0 -l5
-check wait; sleep 1
+check wait; sleep 2
 check raid5
 testdev $md0 3 19456 512
 mdadm -G $md0 -l0
-check wait; sleep 1
+check wait; sleep 2
 while ps auxf | grep "mdadm -G" | grep -v grep
 do
-        sleep 1
+        sleep 2
 done
 check raid0
 testdev $md0 3 19456 512
 mdadm -G $md0 -l5 --add $dev3 $dev4
-check wait; sleep 1
+check wait; sleep 2
 check raid5
 check algorithm 2
 testdev $md0 3 19456 512
 mdadm -G $md0 -l 6
-check wait; sleep 1
+check wait; sleep 2
 check raid6
 check algorithm 2
 testdev $md0 3 19456 512
diff --git a/tests/07autodetect b/tests/07autodetect
index 2db518db..e9a74554 100644
--- a/tests/07autodetect
+++ b/tests/07autodetect
@@ -18,7 +18,7 @@ sfdisk $mdp1 >&2 << END
 END
 udevadm settle
 mdadm -CR -e 0 $md0 -l1 -n2 ${mdp0}p1 ${mdp1}p1
-sleep 1
+sleep 2
 check resync
 check raid1
 check wait
diff --git a/tests/07changelevelintr b/tests/07changelevelintr
index d921f2b2..59fe0db1 100644
--- a/tests/07changelevelintr
+++ b/tests/07changelevelintr
@@ -12,7 +12,7 @@ checkgeo() {
  shift
  sleep 0.5
  check wait
- sleep 1
+ sleep 2
  for attr in level raid_disks chunk_size layout
  do
    if [ $# -gt 0 ] ; then
diff --git a/tests/07changelevels b/tests/07changelevels
index 3df8660e..4ae3a18b 100644
--- a/tests/07changelevels
+++ b/tests/07changelevels
@@ -23,9 +23,9 @@ checkgeo() {
  # level raid_disks chunk_size layout
  dev=$1
  shift
- sleep 15
+ sleep 25
  check wait
- sleep 1
+ sleep 2
  for attr in level raid_disks chunk_size layout
  do
    if [ $# -gt 0 ] ; then
diff --git a/tests/07reshape5intr b/tests/07reshape5intr
index 2af29101..e1169459 100644
--- a/tests/07reshape5intr
+++ b/tests/07reshape5intr
@@ -38,7 +38,7 @@ do
     if [[ $(echo check > /sys/block/md0/md/sync_action) != 0 ]]; then
         break;
     fi
-    sleep 1
+    sleep 2
   done
 
   if [[ i == max ]]; then
diff --git a/tests/09imsm-assemble b/tests/09imsm-assemble
index 9b04aa97..ec99ee88 100644
--- a/tests/09imsm-assemble
+++ b/tests/09imsm-assemble
@@ -20,7 +20,7 @@ imsm_check_removal() {
             success=1
             break
         fi
-        sleep 1
+        sleep 2
     done
 
     if [ $success -ne 1 ]; then
diff --git a/tests/10ddf-assemble-missing b/tests/10ddf-assemble-missing
index 4bf21b25..9fd0a6aa 100644
--- a/tests/10ddf-assemble-missing
+++ b/tests/10ddf-assemble-missing
@@ -16,7 +16,7 @@ mdadm --wait $member0 || true
 mdadm --wait $member1 || true
 
 mdadm -Ss
-sleep 1
+sleep 2
 
 # Add all devices except those for $member0
 mdadm -I $dev10
diff --git a/tests/10ddf-fail-readd b/tests/10ddf-fail-readd
index 9cd78937..a9486769 100644
--- a/tests/10ddf-fail-readd
+++ b/tests/10ddf-fail-readd
@@ -17,7 +17,7 @@ set -- $(get_raiddisks $member0)
 fail0=$1
 mdadm $member0 --fail $fail0
 
-sleep 1
+sleep 2
 mdadm $container --remove $fail0
 
 set -- $(get_raiddisks $member0)
@@ -27,7 +27,7 @@ good0=$1
 # We re-add the disk now
 mdadm $container --add $fail0
 
-sleep 1
+sleep 2
 mdadm --wait $member0 || true
 
 ret=0
diff --git a/tests/10ddf-fail-readd-readonly b/tests/10ddf-fail-readd-readonly
index 6a74d9c8..3936394c 100644
--- a/tests/10ddf-fail-readd-readonly
+++ b/tests/10ddf-fail-readd-readonly
@@ -16,7 +16,7 @@ set -- $(get_raiddisks $member0)
 fail0=$1
 mdadm $member0 --fail $fail0
 
-sleep 1
+sleep 2
 set -- $(get_raiddisks $member0)
 case $1 in MISSING) shift;; esac
 good0=$1
@@ -44,7 +44,7 @@ mdadm $container --remove $fail0
 # We re-add the disk now
 mdadm $container --add $fail0
 
-sleep 1
+sleep 2
 mdadm --wait $member0 || true
 
 set -- $(get_raiddisks $member0)
diff --git a/tests/10ddf-fail-stop-readd b/tests/10ddf-fail-stop-readd
index f8ebe176..4325c34d 100644
--- a/tests/10ddf-fail-stop-readd
+++ b/tests/10ddf-fail-stop-readd
@@ -18,7 +18,7 @@ set -- $(get_raiddisks $member0)
 fail0=$1
 mdadm $member0 --fail $fail0
 
-sleep 1
+sleep 2
 mdadm $container --remove $fail0
 
 set -- $(get_raiddisks $member0)
@@ -27,7 +27,7 @@ good0=$1
 
 mdadm -Ss
 
-sleep 1
+sleep 2
 # Now simulate incremental assembly
 mdadm -I $good0
 mdadm -IRs || true
@@ -38,7 +38,7 @@ mke2fs -F $member0
 # We re-add the disk now
 mdadm $container --add $fail0
 
-sleep 1
+sleep 2
 mdadm --wait $member0 || true
 
 ret=0
diff --git a/tests/10ddf-fail-two-spares b/tests/10ddf-fail-two-spares
index e00810d8..cef8a2b1 100644
--- a/tests/10ddf-fail-two-spares
+++ b/tests/10ddf-fail-two-spares
@@ -23,7 +23,7 @@ sum0=$(sha1sum $member0)
 sum1=$(sha1sum $member1)
 
 mdadm --fail $member1 $dev11
-sleep 1
+sleep 2
 mdadm --fail $member1 $dev12
 
 # We will have 4 resync procedures, 2 spares for 2 arrays.
diff --git a/tests/10ddf-incremental-wrong-order b/tests/10ddf-incremental-wrong-order
index 9ecf6bc2..ce3c2fbf 100644
--- a/tests/10ddf-incremental-wrong-order
+++ b/tests/10ddf-incremental-wrong-order
@@ -23,7 +23,7 @@ sha_0a=$(sha1_sum $member0)
 sha_1a=$(sha1_sum $member1)
 
 mdadm -Ss
-sleep 1
+sleep 2
 
 # Add all devices except those for $member0
 mdadm -I $dev10
@@ -35,7 +35,7 @@ e2fsck -fy $member1
 sha_1b=$(sha1_sum $member1)
 
 mdadm -Ss
-sleep 1
+sleep 2
 
 # Seq number should be different now
 seq8a=$(mdadm -E $dev8 | sed -n 's/^ *Seq : //p')
@@ -64,7 +64,7 @@ sha_0c=$(sha1_sum $member0)
 sha_1c=$(sha1_sum $member1)
 
 mdadm -Ss
-sleep 1
+sleep 2
 
 seq8c=$(mdadm -E $dev8 | sed -n 's/^ *Seq : //p')
 seq10c=$(mdadm -E $dev10 | sed -n 's/^ *Seq : //p')
@@ -103,7 +103,7 @@ if mdadm -A $container $dev8 $dev9 $dev10 $dev11; then
     sha_0d=$(sha1_sum $member0)
     sha_1d=$(sha1_sum $member1)
     mdadm -Ss
-    sleep 1
+    sleep 2
     seq8d=$(mdadm -E $dev8 | sed -n 's/^ *Seq : //p')
     seq10d=$(mdadm -E $dev10 | sed -n 's/^ *Seq : //p')
     if [ x$sha_0a != x$sha_0d ]; then
diff --git a/tests/24raid10deadlock b/tests/24raid10deadlock
index d3cac4cb..9a3b80bd 100644
--- a/tests/24raid10deadlock
+++ b/tests/24raid10deadlock
@@ -54,7 +54,7 @@ clean_up_test()
 	kill -9 $pid
 	kill -9 $action_pid
 
-	sleep 1
+	sleep 2
 
 	if ps $action_pid | tail -1 | awk '{print $3}' | grep D; then
 		die "thread that is writing sysfs is stuck in D state, deadlock is triggered"
diff --git a/tests/24raid456deadlock b/tests/24raid456deadlock
index 80e6e97e..eb5f900a 100644
--- a/tests/24raid456deadlock
+++ b/tests/24raid456deadlock
@@ -36,7 +36,7 @@ clean_up_test()
 	pkill -9 fio
 	kill -9 $pid
 
-	sleep 1
+	sleep 2
 
 	if ps $pid | tail -1 | awk '{print $3}' | grep D; then
 		die "thread that is writing sysfs is stuck in D state, deadlock is triggered"
diff --git a/tests/25raid456-recovery-while-reshape b/tests/25raid456-recovery-while-reshape
index c5e8384c..8701fd93 100644
--- a/tests/25raid456-recovery-while-reshape
+++ b/tests/25raid456-recovery-while-reshape
@@ -18,13 +18,13 @@ set_up_test || die "set up test failed"
 
 # trigger reshape
 mdadm --grow -l 6 $md0
-sleep 1
+sleep 2
 
 # set up replacement
 echo frozen > /sys/block/md0/md/sync_action
 echo want_replacement > /sys/block/md0/md/rd0/state
 echo reshape > /sys/block/md0/md/sync_action
-sleep 1
+sleep 2
 
 # reassemeble array
 mdadm -S $md0 || die "can't stop array"
diff --git a/tests/25raid456-reshape-corrupt-data b/tests/25raid456-reshape-corrupt-data
index ebb08da8..d372816e 100644
--- a/tests/25raid456-reshape-corrupt-data
+++ b/tests/25raid456-reshape-corrupt-data
@@ -20,7 +20,7 @@ set_up_test || die "set up test failed"
 # trigger reshape
 echo 1000 > /sys/block/md0/md/sync_speed_max
 mdadm --grow -l 6 $md0
-sleep 1
+sleep 2
 
 # stop and start reshape
 echo frozen > /sys/block/md0/md/sync_action
diff --git a/tests/25raid456-reshape-deadlock b/tests/25raid456-reshape-deadlock
index 5c25ae5a..9db28f99 100644
--- a/tests/25raid456-reshape-deadlock
+++ b/tests/25raid456-reshape-deadlock
@@ -19,7 +19,7 @@ set_up_test || die "set up test failed"
 
 # trigger reshape
 mdadm --grow -l 6 $md0
-sleep 1
+sleep 2
 
 # stop reshape
 echo frozen > /sys/block/md0/md/sync_action
diff --git a/tests/25raid456-reshape-while-recovery b/tests/25raid456-reshape-while-recovery
index ce6fd264..f5d3f7ab 100644
--- a/tests/25raid456-reshape-while-recovery
+++ b/tests/25raid456-reshape-while-recovery
@@ -18,12 +18,12 @@ set_up_test || die "set up test failed"
 
 # set up replacement
 echo want_replacement > /sys/block/md0/md/rd0/state
-sleep 1
+sleep 2
 
 # trigger reshape
 echo frozen > /sys/block/md0/md/sync_action
 mdadm --grow -l 6 $md0
-sleep 1
+sleep 2
 
 # reassemeble array
 mdadm -S $md0 || die "can't stop array"
diff --git a/tests/func.sh b/tests/func.sh
index 61a35a86..e42c7d56 100644
--- a/tests/func.sh
+++ b/tests/func.sh
@@ -209,7 +209,7 @@ wait_for_reshape_end() {
 	do
 		sync_action=$(grep -Ec '(resync|recovery|reshape|check|repair) *=' /proc/mdstat)
 		if (( "$sync_action" != 0 )); then
-			sleep 1
+			sleep 2
 			continue
 		elif [[ $(pgrep -f "mdadm --grow --continue" > /dev/null) != "" ]]; then
 			echo "Grow continue did not finish but reshape is done" >&2
@@ -381,7 +381,7 @@ check() {
 		do
 			sync_action=$(grep -Ec '(resync|recovery|reshape|check|repair) *=' /proc/mdstat)
 			if (( "$sync_action" == 0 )); then
-				sleep 1
+				sleep 2
 				iterations=$(( $iterations + 1 ))
 				continue
 			else