path: root/xlators/cluster/dht/src
diff options
authorN Balachandran <>2018-03-29 18:23:13 +0530
committerRaghavendra G <>2018-04-02 05:21:42 +0000
commit25690197a6af67669346892c36cca471805b9305 (patch)
tree230fba48ec6072f07b47a19d5c5666e3772e67c3 /xlators/cluster/dht/src
parent3f9851db49ca6ac7a969817964a6ad216b10fd6f (diff)
cluster/dht: Update layout in inode only on success
With lookup-optimize enabled, gf_defrag_settle_hash in rebalance sometimes flips the on-disk layout on volume root post the migration of all files in the directory. This is sometimes seen when attempting to fix the layout of a directory multiple times before calling gf_defrag_settle_hash. dht_fix_layout_of_directory generates a new layout in memory but updates it in the inode ctx before it is set on disk. The layout may be different the second time around due to dht_selfheal_layout_maximize_overlap. If the layout is then not written to the disk, the inode now contains the wrong layout. gf_defrag_settle_hash does not check the correctness of the layout in the inode before updating the commit-hash and writing it to the disk thus changing the layout of the directory. Change-Id: Ie1407d92982518f2a0c40ec70ad370b34a87b4d4 updates: bz#1557435 Signed-off-by: N Balachandran <>
Diffstat (limited to 'xlators/cluster/dht/src')
2 files changed, 24 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index 378377f05ee..80895bd4c9f 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -3593,6 +3593,28 @@ dht_common_setxattr_cbk (call_frame_t *frame, void *cookie,
+static int
+dht_fix_layout_setxattr_cbk (call_frame_t *frame, void *cookie,
+ xlator_t *this, int32_t op_ret, int32_t op_errno,
+ dict_t *xdata)
+ dht_local_t *local = NULL;
+ dht_layout_t *layout = NULL;
+ if (op_ret == 0) {
+ /* update the layout in the inode ctx */
+ local = frame->local;
+ layout = local->selfheal.layout;
+ dht_layout_set (this, local->loc.inode, layout);
+ }
+ DHT_STACK_UNWIND (setxattr, frame, op_ret, op_errno, xdata);
+ return 0;
dht_err_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int op_ret, int op_errno, dict_t *xdata)
@@ -5604,7 +5626,8 @@ dht_setxattr (call_frame_t *frame, xlator_t *this,
"fixing the layout of %s", loc->path);
- ret = dht_fix_directory_layout (frame, dht_common_setxattr_cbk,
+ ret = dht_fix_directory_layout (frame,
+ dht_fix_layout_setxattr_cbk,
if (ret) {
op_errno = ENOTCONN;
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
index 4762f25067f..d3163fd1cfc 100644
--- a/xlators/cluster/dht/src/dht-selfheal.c
+++ b/xlators/cluster/dht/src/dht-selfheal.c
@@ -2000,9 +2000,6 @@ dht_fix_layout_of_directory (call_frame_t *frame, loc_t *loc,
if (new_layout) {
- /* Now that the new layout has all the proper layout, change the
- inode context */
- dht_layout_set (this, loc->inode, new_layout);
/* Make sure the extra 'ref' for existing layout is removed */
dht_layout_unref (this, local->layout);