diff options
author | Nithya Balachandran <nbalacha@redhat.com> | 2014-07-21 18:46:14 +0530 |
---|---|---|
committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2014-10-20 07:54:38 -0700 |
commit | ebdb73daa1c4553b263b208afd22a299e6b7b233 (patch) | |
tree | 36ecb392773f92173c5a236819e60d1f8158aa97 /xlators | |
parent | fe5cf303121215be6f00b4da0796fbf83922ec36 (diff) |
dht: fix rename race
Additional check to check if we created the linkto
file before deleting it in the rename cleanup function
Change-Id: I919cd7cb24f948ba4917eb9cf50d5169bb730a67
BUG: 1139988
Signed-off-by: Nithya Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/8338
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Reviewed-on: http://review.gluster.org/8676
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r-- | xlators/cluster/dht/src/dht-rename.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index 7685ad88427..c206c9de364 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -375,8 +375,10 @@ dht_rename_cleanup (call_frame_t *frame) if (src_cached == dst_cached) goto nolinks; - if (dst_hashed != src_hashed && dst_hashed != src_cached) + if (local->linked && (dst_hashed != src_hashed )&& + (dst_hashed != src_cached)) { call_cnt++; + } if (local->added_link && (src_cached != dst_hashed)) { call_cnt++; @@ -387,10 +389,13 @@ dht_rename_cleanup (call_frame_t *frame) if (!call_cnt) goto nolinks; - if (dst_hashed != src_hashed && dst_hashed != src_cached) { + if (local->linked && (dst_hashed != src_hashed) && + (dst_hashed != src_cached)) { + gf_log (this->name, GF_LOG_TRACE, "unlinking linkfile %s @ %s => %s", local->loc.path, dst_hashed->name, src_cached->name); + STACK_WIND (frame, dht_rename_unlink_cbk, dst_hashed, dst_hashed->fops->unlink, &local->loc, 0, NULL); |