diff options
| author | Shyam <srangana@redhat.com> | 2014-08-12 10:48:27 -0400 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-08-18 10:28:15 -0700 |
| commit | 6630fff4812f4e8617336b98d8e3ac35976e5990 (patch) | |
| tree | 20df3eaa8e5156e18632707cb00575be5bd1b587 /xlators/cluster/dht | |
| parent | ba0f31b2a5c8bd35f99b1ba2a74c81a2c2ded200 (diff) | |
cluster/dht: Fix dht_access treating directory like files
When the cluster topology changes due to add-brick, all sub
volumes of DHT will not contain the directories till a rebalance
is completed. Till the rebalance is run, if a caller bypasses
lookup and calls access due to saved/cached inode information
(like NFS server does) then, dht_access misreads the error
(ESTALE/ENOENT) from the new subvolumes and incorrectly tries
to handle the inode as a file. This results in the directories
in memory state in DHT to be corrupted and not heal even post
a rebalance.
This commit fixes the problem in dht_access thereby preventing
DHT from misrepresenting a directory as a file in the case
presented above.
Change-Id: Idcdaa3837db71c8fe0a40ec0084a6c3dbe27e772
BUG: 1125824
Signed-off-by: Shyam <srangana@redhat.com>
Reviewed-on: http://review.gluster.org/8462
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/cluster/dht')
| -rw-r--r-- | xlators/cluster/dht/src/dht-inode-read.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/dht-inode-read.c b/xlators/cluster/dht/src/dht-inode-read.c index 9a7b3e22354..d78dd2ea0ef 100644 --- a/xlators/cluster/dht/src/dht-inode-read.c +++ b/xlators/cluster/dht/src/dht-inode-read.c @@ -515,9 +515,9 @@ dht_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this, goto out; if (local->call_cnt != 1) goto out; - if ((op_ret == -1) && (op_errno == ENOTCONN) && - IA_ISDIR(local->loc.inode->ia_type)) { - + if ((op_ret == -1) && ((op_errno == ENOTCONN) || + dht_inode_missing(op_errno)) && + IA_ISDIR(local->loc.inode->ia_type)) { subvol = dht_subvol_next_available (this, prev->this); if (!subvol) goto out; @@ -531,7 +531,8 @@ dht_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this, &local->loc, local->rebalance.flags, NULL); return 0; } - if ((op_ret == -1) && dht_inode_missing(op_errno)) { + if ((op_ret == -1) && dht_inode_missing(op_errno) && + !(IA_ISDIR(local->loc.inode->ia_type))) { /* File would be migrated to other node */ local->op_errno = op_errno; local->rebalance.target_op_fn = dht_access2; |