summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSakshi <sabansal@redhat.com>2015-05-26 09:53:55 +0530
committerRaghavendra Talur <rtalur@redhat.com>2016-04-28 23:59:42 -0700
commita8e4a633d5ee42cbbf747ba31f5e3295e6d20ac0 (patch)
treea3fab40015952fab43c3922b36b82a60e6f5d9cf /tests
parentb1d95449adbb40bfccef116914e43d08efae44af (diff)
glusterd: check if glusterd is started on all nodes and all
bricks are started before performing rebalance Backport of http://review.gluster.org/#/c/10906/ > Change-Id: I458ea9cd86cf35bdb7d758be55f951ae9f3e66f0 > BUG: 1224857 > Signed-off-by: Sakshi <sabansal@redhat.com> > Reviewed-on: http://review.gluster.org/10906 > 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: Atin Mukherjee <amukherj@redhat.com> BUG: 1312722 Change-Id: Ib8e59b33e064be8301f682a4b08cb5cf10c22fc9 Signed-off-by: Sakshi <sabansal@redhat.com> Signed-off-by: Raghavendra Talur <rtalur@redhat.com> Reviewed-on: http://review.gluster.org/13537 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>
Diffstat (limited to 'tests')
-rw-r--r--tests/bugs/distribute/bug-860663.t18
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/bugs/distribute/bug-860663.t b/tests/bugs/distribute/bug-860663.t
index f250a736e41..cc2b505080b 100644
--- a/tests/bugs/distribute/bug-860663.t
+++ b/tests/bugs/distribute/bug-860663.t
@@ -1,5 +1,6 @@
#!/bin/bash
+. $(dirname $0)/../../volume.rc
. $(dirname $0)/../../include.rc
cleanup;
@@ -28,23 +29,26 @@ TEST $CLI volume start $V0
## Mount FUSE
TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-TEST $(dirname $0)/bug-860663 $M0/files 10000
+TEST $(dirname $0)/bug-860663 $M0/files 1000
ORIG_FILE_COUNT=`ls -l $M0 | wc -l`;
-TEST [ $ORIG_FILE_COUNT -ge 10000 ]
+TEST [ $ORIG_FILE_COUNT -ge 1000 ]
# Kill a brick process
kill -9 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}1.pid`;
-TEST $CLI volume rebalance $V0 fix-layout start
+TEST ! $CLI volume rebalance $V0 fix-layout start
-sleep 30;
+TEST $CLI volume start $V0 force
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" brick_up_status $V0 $H0 $B0/${V0}1
-TEST ! $(dirname $0)/bug-860663 $M0/files 10000
+TEST $CLI volume rebalance $V0 fix-layout start
-TEST $CLI volume start $V0 force
+EXPECT_WITHIN $REBALANCE_TIMEOUT "fix-layout completed" rebalance_status_field $V0;
-sleep 5;
+# Unmount and remount to make sure we're doing fresh lookups.
+TEST umount $M0
+TEST glusterfs -s $H0 --volfile-id $V0 $M0;
NEW_FILE_COUNT=`ls -l $M0 | wc -l`;