From a5fe0f594d41e1a11661d9074bb19e9c2e2c4776 Mon Sep 17 00:00:00 2001 From: Joseph Fernandes Date: Sun, 3 May 2015 12:41:40 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/10502 Tested-by: Gluster Build System Reviewed-by: Susant Palai Reviewed-by: Dan Lambright --- xlators/cluster/dht/src/dht-common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xlators/cluster/dht/src/dht-common.c') 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) -- cgit