From 6000e1aa344e523aa161427a0b9781e052cd4d97 Mon Sep 17 00:00:00 2001 From: Dan Lambright Date: Thu, 1 Oct 2015 11:05:25 -0400 Subject: cluster/tier: Disallow detach commit when detach in progress 1. Check if detach is running, disallow detach commit if so. 2. Cleanup shutdown of tier daemon on detach: do not rerun fix-layout, do not send incorrect status back to glusterd. Change-Id: I97202f748773c1176396a4ffd32a4c7fa9b9c1bc BUG: 1279637 Signed-off-by: Dan Lambright Reviewed-on: http://review.gluster.org/12560 Tested-by: Gluster Build System Reviewed-by: Atin Mukherjee --- xlators/cluster/dht/src/dht-rebalance.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'xlators/cluster/dht/src/dht-rebalance.c') diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 11164b6586a..7e9ba11fb26 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -3374,9 +3374,6 @@ gf_defrag_start_crawl (void *data) if (ret) goto out; - ret = gf_defrag_fix_layout (this, defrag, &loc, - fix_layout, - migrate_data); } } gf_log ("DHT", GF_LOG_INFO, "crawling file-system completed"); -- cgit