From 31000d1a62da4e8beafb6f5a7b30ae593479a1ce Mon Sep 17 00:00:00 2001 From: Richard Wareing Date: Thu, 27 Aug 2015 21:06:37 -0700 Subject: nfs: Fixes "Remote I/O error" mount failures - Fixes issue where NFS mount fail with "Remove I/O error" after the target directory has been deleted and re-created after the gNFSd has already cached the inode of the first generation of the target directory. - The solution is to follow the guidance of the AFR2 comments and refresh the inode by deleting it from cache and looking it up again. BUG: 1258196 Change-Id: I9c7d8bd460ee9e5ea0b5b47d23886b1afcdcd563 Reported-by: Richard Wareing Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/12046 Tested-by: Gluster Build System --- xlators/nfs/server/src/mount3.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'xlators/nfs') diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 5ac034aa759..2b9a75ee2cc 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -1083,6 +1083,21 @@ err: return ret; } +int __mnt3_resolve_subdir (mnt3_resolve_t *mres); + +/* + * Per the AFR2 comments, this function performs the "fresh" lookup + * by deleting the inode from cache and calling __mnt3_resolve_subdir + * again. + */ +int __mnt3_fresh_lookup (mnt3_resolve_t *mres) { + inode_unlink (mres->resolveloc.inode, + mres->resolveloc.parent, mres->resolveloc.name); + strncpy (mres->remainingdir, mres->resolveloc.path, + strlen(mres->resolveloc.path)); + nfs_loc_wipe (&mres->resolveloc); + return __mnt3_resolve_subdir (mres); +} int32_t mnt3_resolve_subdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, @@ -1107,7 +1122,11 @@ mnt3_resolve_subdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, mres = frame->local; ms = mres->mstate; mntxl = (xlator_t *)cookie; - if (op_ret == -1) { + if (op_ret == -1 && op_errno == ESTALE) { + /* Nuke inode from cache and try the LOOKUP + * request again. */ + return __mnt3_fresh_lookup (mres); + } else if (op_ret == -1) { gf_msg (GF_NFS, GF_LOG_ERROR, op_errno, NFS_MSG_RESOLVE_SUBDIR_FAIL, "path=%s (%s)", mres->resolveloc.path, strerror (op_errno)); -- cgit