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-common.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-common.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 545c4796673..d7b41a8f28a 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -2622,6 +2622,9 @@ dht_find_local_subvol_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int this_call_cnt = 0; int ret = 0; char *uuid_str = NULL; + char *uuid_list = NULL; + char *next_uuid_str = NULL; + char *saveptr = NULL; uuid_t node_uuid = {0,}; @@ -2644,7 +2647,7 @@ dht_find_local_subvol_cbk (call_frame_t *frame, void *cookie, xlator_t *this, goto unlock; } - ret = dict_get_str (xattr, local->xsel, &uuid_str); + ret = dict_get_str (xattr, local->xsel, &uuid_list); if (ret < 0) { gf_log (this->name, GF_LOG_ERROR, "Failed to " @@ -2654,22 +2657,29 @@ dht_find_local_subvol_cbk (call_frame_t *frame, void *cookie, xlator_t *this, goto unlock; } - if (gf_uuid_parse (uuid_str, node_uuid)) { - gf_log (this->name, GF_LOG_ERROR, "Failed to parse uuid" - " failed for %s", prev->this->name); - local->op_ret = -1; - local->op_errno = EINVAL; - goto unlock; - } + for (uuid_str = strtok_r (uuid_list, " ", &saveptr); + uuid_str; + uuid_str = next_uuid_str) { - if (gf_uuid_compare (node_uuid, conf->defrag->node_uuid)) { - gf_log (this->name, GF_LOG_DEBUG, "subvol %s does not" - "belong to this node", prev->this->name); - } else { - conf->local_subvols[(conf->local_subvols_cnt)++] - = prev->this; - gf_log (this->name, GF_LOG_DEBUG, "subvol %s belongs to" - " this node", prev->this->name); + next_uuid_str = strtok_r (NULL, " ", &saveptr); + if (gf_uuid_parse (uuid_str, node_uuid)) { + gf_log (this->name, GF_LOG_ERROR, "Failed to parse uuid" + " failed for %s", prev->this->name); + local->op_ret = -1; + local->op_errno = EINVAL; + goto unlock; + } + + if (gf_uuid_compare (node_uuid, conf->defrag->node_uuid)) { + gf_log (this->name, GF_LOG_DEBUG, "subvol %s does not" + "belong to this node", prev->this->name); + } else { + conf->local_subvols[(conf->local_subvols_cnt)++] + = prev->this; + gf_log (this->name, GF_LOG_DEBUG, "subvol %s belongs to" + " this node", prev->this->name); + break; + } } } |