diff options
author | Sakshi Bansal <sabansal@redhat.com> | 2016-01-07 13:09:58 +0530 |
---|---|---|
committer | Raghavendra Talur <rtalur@redhat.com> | 2016-02-28 23:10:34 -0800 |
commit | 31770ace1baf603f486b7e65ce6f78eff7a20e15 (patch) | |
tree | 982b403629f00b90fb9aafc30559d8157f644b61 /tests | |
parent | 06f4a475f47f2acb243c9d1ad2e2f16587f0ff69 (diff) |
tests: remove-brick commit getting executed before migration has completed
Backport of http://review.gluster.org/13191
Remove brick commit will fail when it is executed while rebalance is in
progress. Hence added a rebalance timeout check before remove-brick commit to
enusre that rebalance has completed.
Change-Id: I5f388b88a68d19f8d2f52937afb771b95be6deaf
BUG: 1311572
Signed-off-by: Sakshi Bansal <sabansal@redhat.com>
Reviewed-on: http://review.gluster.org/13511
Tested-by: Raghavendra Talur <rtalur@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t b/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t index 657c7f8eb01..5ac2ae2a91e 100644 --- a/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t +++ b/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t @@ -23,6 +23,8 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" brick_up_status $V0 $H0 $B0/${V0}1 #remove-brick start should succeed as the brick is up TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}1 start +EXPECT_WITHIN $REBALANCE_TIMEOUT "completed" remove_brick_status_completed_field "$V0 $H0:$B0/${V0}1" + #kill a brick process kill -15 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}1.pid`; |