diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-05-15 13:37:24 -0400 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-06-02 04:27:40 -0700 |
| commit | 5a66d1e6186acfb15e9957b5f196659da8f3cf6d (patch) | |
| tree | 13378c069bc3702473b884ad585534cfaf5f332a /xlators/cluster/dht/src/dht-rebalance.c | |
| parent | 9f29401791ad374015c3d0927b7cf967d66471a6 (diff) | |
cluster/tier: make attach/detach work with new rebalance logic
The new rebalance performance improvements added new
datastructures which were not initialized in the
tier case. Function dht_find_local_subvol_cbk() needs
to accept a list built by lower level DHT translators
in order to build the local subvolumes list.
Change-Id: Iab03fc8e7fadc22debc08cd5bc781b9e3e270497
BUG: 1222088
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/10795
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-rebalance.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 49e0f879381..b93d0859b50 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -2686,8 +2686,7 @@ gf_defrag_start_crawl (void *data) goto out; } - if ((defrag->cmd != GF_DEFRAG_CMD_START_TIER) && - (defrag->cmd != GF_DEFRAG_CMD_START_LAYOUT_FIX)) { + if (defrag->cmd != GF_DEFRAG_CMD_START_LAYOUT_FIX) { migrate_data = dict_new (); if (!migrate_data) { defrag->total_failures++; @@ -2784,11 +2783,7 @@ gf_defrag_start_crawl (void *data) } methods->migration_other(this, defrag); if (defrag->cmd == GF_DEFRAG_CMD_START_DETACH_TIER) { - migrate_data = dict_new (); - if (!migrate_data) { - ret = -1; - goto out; - } + ret = dict_set_str (migrate_data, GF_XATTR_FILE_MIGRATE_KEY, "force"); |