From dfc49143841fe84f846346a30dadce797940eebc Mon Sep 17 00:00:00 2001 From: Shyam Date: Thu, 6 Nov 2014 10:43:37 -0500 Subject: cluster/dht: Fix subvol check, to correctly determine cached file rename The check to treat rename as a critical failure ignored when the cached file is being renamed to new name, as the new name falls on the same subvol as the cached file. This is in addition to when the target of the rename does not exist. The current change is simpler, as the rename logic, renames the cached file in case the target exists and falls on the same subvol as source name, OR the target does not exist and the hash of target falls on the same subvol as source cached. These conditions mean we are renaming the source, other conditions mean we are renaming the source linkto file which we do not want to treat as a critical failure (and we also instruct marker that it is an internal FOP and to not account for the same). Change-Id: I4414e61a0d2b28a429fa747e545ef953e48cfb5b BUG: 1161156 Signed-off-by: Shyam Reviewed-on: http://review.gluster.org/9063 Reviewed-by: N Balachandran Tested-by: Gluster Build System Reviewed-by: susant palai Reviewed-by: venkatesh somyajulu Reviewed-by: Vijay Bellur --- xlators/cluster/dht/src/dht-rename.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index eac3975ccbe..c8a05a3939d 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -642,7 +642,7 @@ dht_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (op_ret == -1) { /* Critical failure: unable to rename the cached file */ - if (src_cached == dst_cached) { + if (prev->this == src_cached) { gf_msg (this->name, GF_LOG_WARNING, op_errno, DHT_MSG_RENAME_FAILED, "%s: Rename on %s failed, (gfid = %s) ", -- cgit