summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaurav Kumar Garg <ggarg@redhat.com>2015-06-01 17:48:23 +0530
committerVenky Shankar <vshankar@redhat.com>2015-06-04 03:51:40 -0700
commita615f6c078c76791318c2a58efcc8baef18c25db (patch)
tree7b57ffda4fc6b804504a3bb86a39ac5b8de4e242
parent402589f58cbb350dfedafa83e133664855ed37b2 (diff)
tests/bitrot: Induce delay before invoking bitrot subcommands
This is to prevent access to uninitialized variable in reconfigure() that's currently getting inititlized on CHILD_UP. [ NOTE: This is a temporary fix and would not be needed when BZ #1226666 is fixed. ] Change-Id: I8779073fe7f315a380b833ddc248c99958de67d0 BUG: 1226902 Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com> Reviewed-on: http://review.gluster.org/11033 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Venky Shankar <vshankar@redhat.com>
-rw-r--r--tests/bugs/bitrot/1209751-bitrot-scrub-tunable-reset.t4
-rw-r--r--tests/bugs/bitrot/1209818-vol-info-show-scrub-process-properly.t4
-rw-r--r--tests/bugs/bitrot/bug-1210684-scrub-pause-resume-error-handling.t4
3 files changed, 12 insertions, 0 deletions
diff --git a/tests/bugs/bitrot/1209751-bitrot-scrub-tunable-reset.t b/tests/bugs/bitrot/1209751-bitrot-scrub-tunable-reset.t
index 919ffc3ba62..1d16057b2ed 100644
--- a/tests/bugs/bitrot/1209751-bitrot-scrub-tunable-reset.t
+++ b/tests/bugs/bitrot/1209751-bitrot-scrub-tunable-reset.t
@@ -24,6 +24,10 @@ TEST $CLI volume bitrot $V0 enable
EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_bitd_count
+## sleep 5 second so that timer can initialize and bitrot can reconfigure that
+## timer value.
+sleep 5;
+
## Set bitrot scrub-throttle value to lazy
TEST $CLI volume bitrot $V0 scrub-throttle lazy
diff --git a/tests/bugs/bitrot/1209818-vol-info-show-scrub-process-properly.t b/tests/bugs/bitrot/1209818-vol-info-show-scrub-process-properly.t
index 4fe02dc7f63..9271a0d0561 100644
--- a/tests/bugs/bitrot/1209818-vol-info-show-scrub-process-properly.t
+++ b/tests/bugs/bitrot/1209818-vol-info-show-scrub-process-properly.t
@@ -24,6 +24,10 @@ TEST $CLI volume bitrot $V0 enable
EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_bitd_count
+## sleep 5 second so that timer can initialize and bitrot can reconfigure that
+## timer value.
+sleep 5;
+
## Set bitrot scrubber process to pause state
TEST $CLI volume bitrot $V0 scrub pause
diff --git a/tests/bugs/bitrot/bug-1210684-scrub-pause-resume-error-handling.t b/tests/bugs/bitrot/bug-1210684-scrub-pause-resume-error-handling.t
index b15b908d21a..4d94213aa27 100644
--- a/tests/bugs/bitrot/bug-1210684-scrub-pause-resume-error-handling.t
+++ b/tests/bugs/bitrot/bug-1210684-scrub-pause-resume-error-handling.t
@@ -24,6 +24,10 @@ TEST $CLI volume bitrot $V0 enable
EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_bitd_count
+## sleep 5 second so that timer can initialize and bitrot can reconfigure that
+## timer value.
+sleep 5;
+
## Pause scrubber operation on volume $V0
TEST $CLI volume bitrot $V0 scrub pause