From 154d8c7a3d09779d2b2eaf7247bd9b8c9420edaa Mon Sep 17 00:00:00 2001 From: Anand Avati Date: Fri, 22 Jul 2011 03:45:34 +0530 Subject: cluster/dht: dht_rename() - handle GFID situations In the pre-GFID era, the linkfile of the destination file could be reused the linkfile for the renamed file when dst_cached == src_cached. This patch handles this situation and reverts the previous (wrong) fix. Change-Id: Iba57b5eb91cf8b1fb40e74f6399cdf99b8b00410 BUG: 2464 Reviewed-on: http://review.gluster.com/88 Tested-by: Gluster Build System Tested-by: Joe Julian Reviewed-by: Amar Tumballi --- xlators/cluster/dht/src/dht-rename.c | 55 +++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index b421d034436..f8ba8578f7c 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -627,6 +627,41 @@ cleanup: } +int +dht_rename_unlink_links_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + int32_t op_ret, int32_t op_errno, + struct iatt *preparent, struct iatt *postparent) +{ + dht_local_t *local = NULL; + call_frame_t *prev = NULL; + + + local = frame->local; + prev = cookie; + + if (op_ret == -1) { + gf_log (this->name, GF_LOG_DEBUG, + "unlink of %s on %s failed (%s)", + local->loc2.path, prev->this->name, + strerror (op_errno)); + local->op_ret = -1; + local->op_errno = op_errno; + } + + if (local->op_ret == -1) + goto cleanup; + + dht_do_rename (frame); + + return 0; + +cleanup: + dht_rename_cleanup (frame); + + return 0; +} + + int dht_rename_create_links (call_frame_t *frame) { @@ -647,8 +682,20 @@ dht_rename_create_links (call_frame_t *frame) dst_hashed = local->dst_hashed; dst_cached = local->dst_cached; - if (src_cached == dst_cached) - goto nolinks; + + if (src_cached == dst_cached) { + if (dst_hashed == dst_cached) + goto nolinks; + + gf_log (this->name, GF_LOG_TRACE, + "unlinking dst linkfile %s @ %s", + local->loc2.path, dst_hashed->name); + + STACK_WIND (frame, dht_rename_unlink_links_cbk, + dst_hashed, dst_hashed->fops->unlink, + &local->loc2); + return 0; + } if (dst_hashed != src_hashed && dst_hashed != src_cached) call_cnt++; @@ -656,14 +703,14 @@ dht_rename_create_links (call_frame_t *frame) if (src_cached != dst_hashed) call_cnt++; - local->call_cnt = call_cnt; + local->call_cnt = call_cnt; if (dst_hashed != src_hashed && dst_hashed != src_cached) { gf_log (this->name, GF_LOG_TRACE, "linkfile %s @ %s => %s", local->loc.path, dst_hashed->name, src_cached->name); memcpy (local->gfid, local->loc.inode->gfid, 16); - dht_linkfile_recreate (frame, dht_rename_links_cbk, + dht_linkfile_create (frame, dht_rename_links_cbk, src_cached, dst_hashed, &local->loc); } -- cgit