summaryrefslogtreecommitdiffstats
path: root/xlators/features
diff options
context:
space:
mode:
authorvmallika <vmallika@redhat.com>2014-11-20 20:36:00 +0530
committerVijay Bellur <vbellur@redhat.com>2014-11-25 22:26:04 -0800
commit8277f4e4a4e92543ac139ef63d0ad82add397de7 (patch)
treed237c8180e6b6e0e962347683f1575739060563c /xlators/features
parentff9ffab7b4e991de6191f10909c32a7a08f20ada (diff)
gluster/uss: Handle ESTALE in snapview client when NFS server restarted
When NFS server is restarted inode-context is lost. Nameless lookup will be sent to regular volume. If the gfid is from virtual graph, lookup will fail with ESTALE. We need to send a lookup to snapview server Change-Id: I22920614f0d14cb90b53653fce95b6b70023eba6 BUG: 1166197 Signed-off-by: vmallika <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/9153 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Sachin Pandit <spandit@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/features')
-rw-r--r--xlators/features/snapview-client/src/snapview-client.c35
-rw-r--r--xlators/features/snapview-server/src/snapview-server.c8
2 files changed, 30 insertions, 13 deletions
diff --git a/xlators/features/snapview-client/src/snapview-client.c b/xlators/features/snapview-client/src/snapview-client.c
index 5f58422c32e..ea0feeaf4b2 100644
--- a/xlators/features/snapview-client/src/snapview-client.c
+++ b/xlators/features/snapview-client/src/snapview-client.c
@@ -147,16 +147,36 @@ svc_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
is happening on a virtual inode (i.e history data residing in snaps).
So if lookup fails with ENOENT and the inode context is not there,
then send the lookup to the 2nd child of svc.
+
+ If there are any changes in volfile/client-restarted then inode-ctx
+ is lost. In this case if nameless lookup fails with ESTALE,
+ then send the lookup to the 2nd child of svc.
*/
if (op_ret) {
- if (op_errno == ENOENT &&
+ if (subvolume == FIRST_CHILD (this)) {
+ gf_log (this->name,
+ (op_errno == ENOENT || op_errno == ESTALE)
+ ? GF_LOG_DEBUG:GF_LOG_ERROR,
+ "Lookup failed on normal graph with error %s",
+ strerror (op_errno));
+ } else {
+ gf_log (this->name,
+ (op_errno == ENOENT || op_errno == ESTALE)
+ ? GF_LOG_DEBUG:GF_LOG_ERROR,
+ "Lookup failed on snapview graph with error %s",
+ strerror (op_errno));
+ }
+
+ if ((op_errno == ENOENT || op_errno == ESTALE) &&
!uuid_is_null (local->loc.gfid)) {
ret = svc_inode_ctx_get (this, inode, &inode_type);
if (ret < 0 && subvolume == FIRST_CHILD (this)) {
gf_log (this->name, GF_LOG_DEBUG,
"Lookup on normal graph failed. "
"Sending lookup to snapview-server");
+
subvolume = SECOND_CHILD (this);
+ local->subvolume = subvolume;
STACK_WIND (frame, svc_lookup_cbk, subvolume,
subvolume->fops->lookup,
&local->loc, xdata);
@@ -164,18 +184,7 @@ svc_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
}
}
- if (subvolume == FIRST_CHILD (this)) {
- gf_log (this->name,
- (op_errno == ENOENT)?GF_LOG_DEBUG:GF_LOG_ERROR,
- "Lookup failed on normal graph with error %s",
- strerror (op_errno));
- } else {
- gf_log (this->name,
- (op_errno == ENOENT)?GF_LOG_DEBUG:GF_LOG_ERROR,
- "Lookup failed on snapview graph with error %s",
- strerror (op_errno));
- }
- goto out;
+ goto out;
}
if (local->loc.parent)
diff --git a/xlators/features/snapview-server/src/snapview-server.c b/xlators/features/snapview-server/src/snapview-server.c
index 6c65497b34c..d66150e769a 100644
--- a/xlators/features/snapview-server/src/snapview-server.c
+++ b/xlators/features/snapview-server/src/snapview-server.c
@@ -536,6 +536,14 @@ svs_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
fs = svs_initialise_snapshot_volume (this, dirent->name, NULL);
}
+ if (inode_ctx && inode_ctx->type == SNAP_VIEW_ENTRY_POINT_INODE) {
+ /* entry-point may not be set in the dictonary.
+ * This can happen if snap-view client is restarted where
+ * inode-ctx not available and a nameless lookup has come
+ */
+ entry_point = _gf_true;
+ }
+
/* lookup is on the entry point to the snapshot world */
if (entry_point) {
op_ret = svs_lookup_entry_point (this, loc, parent, &buf,