From d9cc672719b96168c46bc82334f44efc010adad5 Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Fri, 29 Jan 2016 16:24:02 +0530 Subject: glusterd/rebalance: initialize defrag variable after glusterd restart During reblance restart after glusterd restarted, we are not connecting to rebalance process from glusterd, because the defrag variable in volinfo will be null. Initializing the variable will connect the rpc Back port of> >Change-Id: Id820cad6a3634a9fc976427fbe1c45844d3d4b9b >BUG: 1303028 >Signed-off-by: Mohammed Rafi KC >Reviewed-on: http://review.gluster.org/13319 >Smoke: Gluster Build System >NetBSD-regression: NetBSD Build System >Reviewed-by: Dan Lambright >CentOS-regression: Gluster Build System (cherry picked from commit a67331f3f79e827ffa4f7a547f6898e12407bbf9) Change-Id: Ieec82a798da937002e09fb9325c93678a5eefca8 BUG: 1311041 Signed-off-by: Mohammed Rafi KC Reviewed-on: http://review.gluster.org/13494 Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Atin Mukherjee --- tests/basic/tier/tier.t | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tests/basic') diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index c7c95690e70..cfd8e775f7f 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -13,6 +13,10 @@ MIGRATION_TIMEOUT=10 DEMOTE_FREQ=4 PROMOTE_FREQ=12 +function detach_start { + $CLI volume tier $1 detach start + echo $?; +} function file_on_slow_tier { found=0 @@ -191,8 +195,7 @@ EXPECT "0" file_on_slow_tier d1/data.txt $md5data EXPECT "0" file_on_slow_tier d1/data2.txt $md5data2 EXPECT "0" file_on_slow_tier "./d1/$SPACE_FILE" $md5space -TEST $CLI volume tier $V0 detach start - +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" detach_start $V0 EXPECT_WITHIN $REBALANCE_TIMEOUT "completed" remove_brick_status_completed_field "$V0 $H0:$B0/${V0}${CACHE_BRICK_FIRST}" TEST $CLI volume tier $V0 detach commit -- cgit