diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-10-01 11:05:25 -0400 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-11-16 05:18:55 -0800 |
| commit | 3a13092cb001b1a998268a2cdb0056615ece1d54 (patch) | |
| tree | 9e188813a0a39eeaa24bcb4e1960748e1e79e207 /xlators/cluster/dht/src/dht-rebalance.c | |
| parent | 24f2173e391a517901750138db95bff3f0bd026e (diff) | |
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: 1264441
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/12272
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Joseph Fernandes
Diffstat (limited to 'xlators/cluster/dht/src/dht-rebalance.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 2163b9b1dd5..f1b0ecfeef0 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -3257,9 +3257,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"); |