diff options
| author | N Balachandran <nbalacha@redhat.com> | 2017-10-10 21:45:01 +0530 |
|---|---|---|
| committer | jiffin tony Thottan <jthottan@redhat.com> | 2017-10-12 18:25:29 +0000 |
| commit | 417088fbac3e44d87802cfc988a51e2ad7968d70 (patch) | |
| tree | ade28a4e592b179bbbefe29d5652460376a8b615 /xlators/cluster/dht/src/dht-common.c | |
| parent | 08e083ac43f3b35892df808f41d4f9fbe6c2154b (diff) | |
cluster/dht: Don't store the entire uuid for subvols
Comparing the uuid string of the local node against that stored in the
local_subvol information is inefficient, especially as it is
done for every file to be migrated. The code has now been changed
to set the value of info to 1 if the nodeuuid is that of the node
making the comparison so this becomes an integer comparison.
> BUG: 1451434
> Signed-off-by: N Balachandran <nbalacha@redhat.com>
> https://review.gluster.org/#/c/17851
(cherry picked from commit c4a608799a577a4f38139f6bb8a47da8efb0fec3)
Change-Id: I7491d59caad3b71dbf5facc94dcde0cd53962775
BUG: 1500472
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-common.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index b8a860d8049..c6944b21c85 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -3033,7 +3033,7 @@ dht_find_local_subvol_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int i = 0; int index = 0; int found = 0; - + nodeuuid_info_t *tmp_ptr = NULL; VALIDATE_OR_GOTO (frame, out); VALIDATE_OR_GOTO (frame->local, out); @@ -3118,8 +3118,8 @@ dht_find_local_subvol_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } conf->local_nodeuuids[index].count = count; - conf->local_nodeuuids[index].uuids - = GF_CALLOC (count, sizeof (uuid_t), 1); + conf->local_nodeuuids[index].elements + = GF_CALLOC (count, sizeof (nodeuuid_info_t), 1); /* The node-uuids are guaranteed to be returned in the same * order as the bricks @@ -3134,9 +3134,15 @@ dht_find_local_subvol_cbk (call_frame_t *frame, void *cookie, xlator_t *this, uuid_str = next_uuid_str) { next_uuid_str = strtok_r (NULL, " ", &saveptr); - gf_uuid_parse (uuid_str, - conf->local_nodeuuids[index].uuids[i]); + tmp_ptr = &(conf->local_nodeuuids[index].elements[i]); + gf_uuid_parse (uuid_str, tmp_ptr->uuid); + + if (!gf_uuid_compare (tmp_ptr->uuid, + conf->defrag->node_uuid)) { + tmp_ptr->info = REBAL_NODEUUID_MINE; + } i++; + tmp_ptr = NULL; } } @@ -3156,8 +3162,8 @@ dht_find_local_subvol_cbk (call_frame_t *frame, void *cookie, xlator_t *this, unwind: - GF_FREE (conf->local_nodeuuids[index].uuids); - conf->local_nodeuuids[index].uuids = NULL; + GF_FREE (conf->local_nodeuuids[index].elements); + conf->local_nodeuuids[index].elements = NULL; DHT_STACK_UNWIND (getxattr, frame, -1, local->op_errno, NULL, xdata); out: |