diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2015-05-09 12:23:10 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-09 00:22:41 -0700 |
| commit | 988e00f83cb74c908471caf6af9cbce05b7f95c9 (patch) | |
| tree | 365d75fb8754a3bc9254f47f2e480763e3f2c209 | |
| parent | 5faf4801bd6839cec58324a45dec31f977992236 (diff) | |
tests: fix bitrot spurious failures
Change-Id: I55bd62480b7ee38cf7b29aeba67b19b0c5bbe2fb
BUG: 1220016
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/10702
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Vijay Bellur <vbellur@redhat.com>
5 files changed, 18 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 4f98174c16f..51603dfc21e 100644 --- a/tests/bugs/bitrot/1209751-bitrot-scrub-tunable-reset.t +++ b/tests/bugs/bitrot/1209751-bitrot-scrub-tunable-reset.t @@ -22,6 +22,8 @@ TEST $CLI volume start $V0 ## Enable bitrot on volume $V0 TEST $CLI volume bitrot $V0 enable +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" get_bitd_count + ## Set bitrot scrub-throttle value to lazy TEST $CLI volume bitrot $V0 scrub-throttle lazy diff --git a/tests/bugs/bitrot/1209752-volume-status-should-show-bitrot-scrub-info.t b/tests/bugs/bitrot/1209752-volume-status-should-show-bitrot-scrub-info.t index 89d2418e290..6101910666c 100644 --- a/tests/bugs/bitrot/1209752-volume-status-should-show-bitrot-scrub-info.t +++ b/tests/bugs/bitrot/1209752-volume-status-should-show-bitrot-scrub-info.t @@ -26,6 +26,9 @@ TEST $CLI_1 volume start $V0 ## Enable bitrot on volume $V0 TEST $CLI_1 volume bitrot $V0 enable +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" get_bitd_count +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" get_scrubd_count + ## From node 1 Gluster volume status command should show the status of bitrot ## daemon of all the nodes. there are 2 nodes in a cluster with having brick ## ${V0}1 and ${V0}2 . So there should be 2 bitrot daemon running. 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 efba5794b08..7ee97d5df43 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 @@ -22,6 +22,8 @@ TEST $CLI volume start $V0 ## Enable bitrot on volume $V0 TEST $CLI volume bitrot $V0 enable +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" get_bitd_count + ## 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 0a306df4698..6c5521217a6 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 @@ -22,6 +22,8 @@ TEST $CLI volume start $V0 ## Enable bitrot for volume $V0 TEST $CLI volume bitrot $V0 enable +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" get_bitd_count + ## Pause scrubber operation on volume $V0 TEST $CLI volume bitrot $V0 scrub pause diff --git a/tests/volume.rc b/tests/volume.rc index e7d7606ac11..8c216f76166 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -531,3 +531,12 @@ else echo "1" fi } + +function get_bitd_count { + ps auxw | grep glusterfs | grep bitd.pid | grep -v grep | wc -l +} + +function get_scrubd_count { + ps auxw | grep glusterfs | grep scrub.pid | grep -v grep | wc -l +} + |