diff options
| author | Nithya Balachandran <nbalacha@redhat.com> | 2014-09-10 22:45:56 +0530 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2014-09-17 08:34:45 -0700 |
| commit | 21342c76f123df72d6e78fdca437e92e5d6a6841 (patch) | |
| tree | ed3ecec0101cce876e2e91c7775b207c78c5beb2 /xlators | |
| parent | 3f3e57cef2cd11f336a6d6496de37c89a3e90789 (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: 1129527
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>
(cherry picked from commit df770496ba5ed6d2c72bcfc76ca9e816a08c383a)
Signed-off-by: Nithya Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/8718
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/dht/src/dht-rename.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index d092139b1d6..e779cf776c2 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -418,8 +418,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++; @@ -432,7 +434,9 @@ dht_rename_cleanup (call_frame_t *frame) DHT_MARK_FOP_INTERNAL (xattr); - if (dst_hashed != src_hashed && dst_hashed != src_cached) { + + if (local->linked && (dst_hashed != src_hashed) && + (dst_hashed != src_cached)) { dict_t *xattr_new = NULL; gf_log (this->name, GF_LOG_TRACE, |