summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorshishir gowda <sgowda@redhat.com>2013-03-07 19:41:33 +0530
committerAnand Avati <avati@redhat.com>2013-03-07 19:51:22 -0800
commit140e9756a569efd02ea970cb484d6f1a7c3da688 (patch)
tree4d414698515bea3bca6718b039219b4ea34986b9 /tests
parent90d77fbdd2c5066279f2c7ddeee0980811ba4923 (diff)
cluster/distribute: Fix layout overlaps due to spread-count in selfheal path
We needed to zero out the layout range, before we re-calculate the range. When spread-count is issued, we would end up with stale ranges in the layout. Replaced dht_selfheal_dir_xattr with dht_fix_dir_xattr, which correctly resets the un-used (after re-cal) layouts. Change-Id: I1a900d15df07335f59356bd23182ccec34381ab2 BUG: 884455 Signed-off-by: shishir gowda <sgowda@redhat.com> Reviewed-on: http://review.gluster.org/4647 Reviewed-by: Amar Tumballi <amarts@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-x[-rw-r--r--]tests/bugs/bug-884455.t10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/bugs/bug-884455.t b/tests/bugs/bug-884455.t
index e5b782267d0..c193cd8aad6 100644..100755
--- a/tests/bugs/bug-884455.t
+++ b/tests/bugs/bug-884455.t
@@ -1,6 +1,7 @@
#!/bin/bash
. $(dirname $0)/../include.rc
+. $(dirname $0)/../dht.rc
cleanup;
@@ -54,13 +55,18 @@ TEST $CLI volume start $V0
## Mount FUSE
TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-TEST mkdir $M0/dir{1..10};
+TEST mkdir $M0/dir{1..10} 2>/dev/null;
## Add-brick n run rebalance to force re-write of layout
TEST $CLI volume add-brick $V0 $H0:$B0/${V0}2
sleep 5;
+
+## trigger dir self heal on client
+TEST ls -l $M0 2>/dev/null;
+
TEST $CLI volume rebalance $V0 start force
-sleep 30;
+
+EXPECT_WITHIN 15 "0" rebalance_completed
## check for layout overlaps.
EXPECT "0" get_layout $B0/${V0}0 $B0/${V0}1 $B0/${V0}2