summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSakshi Bansal <sabansal@redhat.com>2016-05-17 13:23:28 +0530
committerRaghavendra G <rgowdapp@redhat.com>2016-05-18 02:59:25 -0700
commit6a6b953d4f999b6db11cc6b62880e810aee9a4c7 (patch)
tree92f9cc05376e991e46d3db1d73f0e7e76906ef36
parent2df72780e473709128a4f5d7f274a9063b288252 (diff)
dht: rename takes lock on parent directory if destination exists
For directory rename if destination exists the source directory is created as a child of the given destination directory. Since the new child directory does not exist take lock on parent of the child directory. Change-Id: I24a34605a2cd65984910643ff5462f35e8fc7e71 BUG: 1336698 Signed-off-by: Sakshi Bansal <sabansal@redhat.com> Reviewed-on: http://review.gluster.org/14371 Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--xlators/cluster/dht/src/dht-rename.c39
1 files changed, 32 insertions, 7 deletions
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c
index 0f90f433180..f4f834c8342 100644
--- a/xlators/cluster/dht/src/dht-rename.c
+++ b/xlators/cluster/dht/src/dht-rename.c
@@ -321,6 +321,7 @@ dht_rename_dir (call_frame_t *frame, xlator_t *this)
dht_lock_t **lk_array = NULL;
dht_layout_t *dst_layout = NULL;
xlator_t *first_subvol = NULL;
+ loc_t parent_loc = {0, };
int count = 1;
int i = 0;
int j = 0;
@@ -339,6 +340,11 @@ dht_rename_dir (call_frame_t *frame, xlator_t *this)
dst_layout = dht_layout_get (this, local->loc2.inode);
if (dst_layout)
++count;
+ } else if (gf_uuid_compare (local->loc.parent->gfid,
+ local->loc2.parent->gfid)) {
+ dst_layout = dht_layout_get (this, local->loc2.parent);
+ if (dst_layout)
+ ++count;
}
for (i = 0; i < conf->subvolume_cnt; i++) {
@@ -379,22 +385,39 @@ dht_rename_dir (call_frame_t *frame, xlator_t *this)
* rename completes. To avoid a lookup selfheal to change dst layout
* during this interval we take a lock on one subvol of dst.
*/
- if (dst_layout) {
- for (j = 0; (j < dst_layout->cnt) &&
- (dst_layout->list[j].err == 0); j++) {
+ for (j = 0; dst_layout && (j < dst_layout->cnt) &&
+ (dst_layout->list[j].err == 0); j++) {
- first_subvol = dst_layout->list[j].xlator;
+ first_subvol = dst_layout->list[j].xlator;
+ if (local->loc2.inode) {
lk_array[i] = dht_lock_new (frame->this, first_subvol,
&local->loc2, F_WRLCK,
DHT_LAYOUT_HEAL_DOMAIN);
- if (lk_array[i] == NULL) {
- op_errno = ENOMEM;
+ } else {
+ ret = dht_build_parent_loc (this, &parent_loc,
+ &local->loc2, &op_errno);
+ if (ret) {
+ gf_msg (this->name, GF_LOG_ERROR, ENOMEM,
+ DHT_MSG_NO_MEMORY,
+ "parent loc build failed");
goto err;
}
- break;
+
+ lk_array[i] = dht_lock_new (frame->this, first_subvol,
+ &parent_loc, F_WRLCK,
+ DHT_LAYOUT_HEAL_DOMAIN);
}
+
+ if (lk_array[i] == NULL) {
+ op_errno = ENOMEM;
+ goto err;
+ }
+ break;
}
+ if (!lk_array[i])
+ --count;
+
local->lock.locks = lk_array;
local->lock.lk_count = count;
@@ -408,6 +431,7 @@ dht_rename_dir (call_frame_t *frame, xlator_t *this)
goto err;
}
+ loc_wipe (&parent_loc);
return 0;
err:
@@ -416,6 +440,7 @@ err:
GF_FREE (lk_array);
}
+ loc_wipe (&parent_loc);
op_errno = (op_errno == -1) ? errno : op_errno;
DHT_STACK_UNWIND (rename, frame, -1, op_errno, NULL, NULL, NULL, NULL,
NULL, NULL);