summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-common.c
diff options
context:
space:
mode:
authorJoseph Fernandes <josferna@redhat.com>2015-05-03 12:41:40 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-05-05 09:02:58 -0700
commita5fe0f594d41e1a11661d9074bb19e9c2e2c4776 (patch)
tree9666205f8370c9b79cb2a9dd43c6f3ced6b31620 /xlators/cluster/dht/src/dht-common.c
parent1306237c092ee8f927f16cae1b2b430a13e0a34f (diff)
dht/tier/rebalancer: Fix reset of tiering client pid
In the patch http://review.gluster.org/#/c/9657 the client pid set by tiering migration was getting over- written in dht_start_rebalance_task(). Just corrected it in dht_setxattr() before calling dht_start_rebalance_task() and removed it from dht_start_rebalance_task(). Change-Id: I37cfa111f83a4e5d498042575c93799f60b49870 BUG: 1217937 Signed-off-by: Joseph Fernandes <josferna@redhat.com> Reviewed-on: http://review.gluster.org/10502 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Susant Palai <spalai@redhat.com> Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-common.c')
-rw-r--r--xlators/cluster/dht/src/dht-common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index 6c0afdbec90..fbb4eaee4e5 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -3444,9 +3444,11 @@ dht_setxattr (call_frame_t *frame, xlator_t *this,
* data migration and set the frame->root->pid to
* GF_CLIENT_PID_TIER_DEFRAG in dht_setxattr() just before
* calling dht_start_rebalance_task() */
- tmp = dict_get (xattr, "tiering.migration");
+ tmp = dict_get (xattr, TIERING_MIGRATION_KEY);
if (tmp)
frame->root->pid = GF_CLIENT_PID_TIER_DEFRAG;
+ else
+ frame->root->pid = GF_CLIENT_PID_DEFRAG;
ret = dht_start_rebalance_task (this, frame);
if (!ret)