diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-09-01 20:26:15 -0400 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-09-02 10:24:26 -0700 |
| commit | 9f27ef94827e5b73276887011153633291549cda (patch) | |
| tree | 66a89371f44c692e4373c15500fae82c760a2f54 /xlators/cluster/dht/src/dht-common.c | |
| parent | 44dc74645144bfbca4aa0f08e36972359645a42c (diff) | |
cluster/tier: make attach/detach work with new rebalance logic
This is a backport of 10795.
> 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>
Change-Id: Icbd51c96ae4d367d1edf41cdd0edb35095195699
BUG: 1259079
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/12085
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 | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index f83ff6487a2..f5de8e6a6ad 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -2661,6 +2661,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,}; @@ -2683,7 +2686,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_msg (this->name, GF_LOG_ERROR, 0, @@ -2694,24 +2697,32 @@ 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_msg (this->name, GF_LOG_ERROR, 0, - DHT_MSG_UUID_PARSE_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_msg_debug (this->name, 0, "subvol %s does not" - "belong to this node", prev->this->name); - } else { - conf->local_subvols[(conf->local_subvols_cnt)++] - = prev->this; - gf_msg_debug (this->name, 0, "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_msg (this->name, GF_LOG_ERROR, 0, + DHT_MSG_UUID_PARSE_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_msg_debug (this->name, 0, "subvol %s does not" + "belong to this node", + prev->this->name); + } else { + conf->local_subvols[(conf->local_subvols_cnt)++] + = prev->this; + gf_msg_debug (this->name, 0, "subvol %s belongs to" + " this node", prev->this->name); + break; + } } } |