summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-selfheal.c
diff options
context:
space:
mode:
authorSakshi Bansal <sabansal@redhat.com>2016-02-04 16:02:59 +0530
committerRaghavendra G <rgowdapp@redhat.com>2016-02-26 03:14:32 -0800
commitdbf0ca53a5704c7f94257fc4223b41865458301a (patch)
tree2d2347a247ab728e8701b5e0604d7b70075ab059 /xlators/cluster/dht/src/dht-selfheal.c
parentd136a789258e8f600e536717da156a242d8ed9a5 (diff)
dht: mkdir must unwind with latest ctime
Currently fops like mkdir used the the ctime it gets after creating the directory entry. But setting layout also updates the ctime of a directory. Hence DHT must get the ctime after the setxattr call and unwind with the latest ctime to avoid mismatch in time seen by applications like tar. Change-Id: Iecbbe3aac5244af5da9788b48ccf299ca56b4bae BUG: 1302948 Signed-off-by: Sakshi Bansal <sabansal@redhat.com> Reviewed-on: http://review.gluster.org/13352 Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-selfheal.c')
-rw-r--r--xlators/cluster/dht/src/dht-selfheal.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
index 1eef4bd..bcc865c 100644
--- a/xlators/cluster/dht/src/dht-selfheal.c
+++ b/xlators/cluster/dht/src/dht-selfheal.c
@@ -609,7 +609,9 @@ dht_selfheal_dir_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
dht_local_t *local = NULL;
call_frame_t *prev = NULL;
xlator_t *subvol = NULL;
+ struct iatt *stbuf = NULL;
int i = 0;
+ int ret = 0;
dht_layout_t *layout = NULL;
int err = 0;
int this_call_cnt = 0;
@@ -624,6 +626,12 @@ dht_selfheal_dir_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
else
err = op_errno;
+ ret = dict_get_bin (xdata, DHT_IATT_IN_XDATA_KEY, (void **) &stbuf);
+ if (ret < 0) {
+ gf_msg_debug (this->name, 0, "key = %s not present in dict",
+ DHT_IATT_IN_XDATA_KEY);
+ }
+
for (i = 0; i < layout->cnt; i++) {
if (layout->list[i].xlator == subvol) {
layout->list[i].err = err;
@@ -631,6 +639,7 @@ dht_selfheal_dir_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
}
}
+ dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
this_call_cnt = dht_frame_return (frame);
if (is_last_call (this_call_cnt)) {
@@ -690,6 +699,15 @@ dht_selfheal_dir_xattr_persubvol (call_frame_t *frame, loc_t *loc,
goto err;
}
+ ret = dict_set_dynstr_with_alloc (xdata, DHT_IATT_IN_XDATA_KEY, "yes");
+ if (ret < 0) {
+ gf_msg (this->name, GF_LOG_WARNING, 0, DHT_MSG_DICT_SET_FAILED,
+ "%s: Failed to set dictionary value: key = %s,"
+ " gfid = %s", loc->path,
+ DHT_IATT_IN_XDATA_KEY, gfid);
+ goto err;
+ }
+
gf_uuid_unparse(loc->inode->gfid, gfid);
ret = dht_disk_layout_extract (this, layout, i, &disk_layout);