From 10301574b24614369d6b6844664d7729680fbf32 Mon Sep 17 00:00:00 2001 From: N Balachandran Date: Mon, 23 Jan 2017 22:19:01 +0530 Subject: [PATCH 325/361] cluster/dht: Don't update layout in rebalance_task_completion Updating the layout in the dht inode_ctx in rebalance_task_completion after the file is migrated is erroneous in case of files with hardlinks. This step can be skipped as the layout will be set in the syncop_lookup call post the migration in dht_migrate_file. mainline: > BUG: 1415761 > Reviewed-on: https://review.gluster.org/16457 > Smoke: Gluster Build System > NetBSD-regression: NetBSD Build System > CentOS-regression: Gluster Build System > Reviewed-by: Raghavendra G > Reviewed-by: Susant Palai (cherry picked from commit ee00e667a27b742751c863787b9c9fe78c892e7d) BUG: 1409474 Change-Id: I24ac798a919585d91a117d6a207e6a31b88486c6 Signed-off-by: N Balachandran Reviewed-on: https://code.engineering.redhat.com/gerrit/101306 Tested-by: Milind Changire Reviewed-by: Atin Mukherjee --- xlators/cluster/dht/src/dht-rebalance.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 76778de..7c1a1d2 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -1922,32 +1922,8 @@ rebalance_task (void *data) static int rebalance_task_completion (int op_ret, call_frame_t *sync_frame, void *data) { - int ret = -1; - uint64_t layout_int = 0; - dht_layout_t *layout = 0; - xlator_t *this = NULL; - dht_local_t *local = NULL; int32_t op_errno = EINVAL; - this = THIS; - local = sync_frame->local; - - if (!op_ret) { - /* Make sure we have valid 'layout' in inode ctx - after the operation */ - ret = inode_ctx_del (local->loc.inode, this, &layout_int); - if (!ret && layout_int) { - layout = (dht_layout_t *)(long)layout_int; - dht_layout_unref (this, layout); - } - - ret = dht_layout_preset (this, local->rebalance.target_node, - local->loc.inode); - if (ret) - gf_log (this->name, GF_LOG_WARNING, - "%s: failed to set inode ctx", local->loc.path); - } - if (op_ret == -1) { /* Failure of migration process, mostly due to write process. as we can't preserve the exact errno, lets say there was -- 1.8.3.1