diff options
| -rwxr-xr-x | tests/bugs/upcall/bug-1422776.t | 30 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker.c | 2 | ||||
| -rw-r--r-- | xlators/features/upcall/src/upcall.c | 4 |
3 files changed, 36 insertions, 0 deletions
diff --git a/tests/bugs/upcall/bug-1422776.t b/tests/bugs/upcall/bug-1422776.t new file mode 100755 index 00000000000..cb249ce1cd2 --- /dev/null +++ b/tests/bugs/upcall/bug-1422776.t @@ -0,0 +1,30 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc + +cleanup; + +## Start glusterd +TEST glusterd; + +## Lets create volume +TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2,3}; + +## Enable the upcall xlator, and increase the md-cache timeout to max +TEST $CLI volume set $V0 features.cache-invalidation on +TEST $CLI volume set $V0 features.cache-invalidation-timeout 600 +TEST $CLI volume set $V0 indexing on + +## Start the volume +TEST $CLI volume start $V0 +TEST $CLI volume quota $V0 enable + +## Create two gluster mounts +TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 + +## Create directory and files from the M0 +TEST touch $M0/file1 +TEST mv $M0/file1 $M0/file2 + +cleanup; diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index f578f6c3f44..b51b9ccc9f5 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -1292,6 +1292,8 @@ marker_rename_done (call_frame_t *frame, void *cookie, xlator_t *this, loc_wipe (&newloc); if (priv->feature_enabled & GF_XTIME) { + if (!local->loc.inode) + local->loc.inode = inode_ref (oplocal->loc.inode); //update marks on oldpath gf_uuid_copy (local->loc.gfid, oplocal->loc.inode->gfid); marker_xtime_update_marks (this, oplocal); diff --git a/xlators/features/upcall/src/upcall.c b/xlators/features/upcall/src/upcall.c index 19180e555f5..40ad1c4e379 100644 --- a/xlators/features/upcall/src/upcall.c +++ b/xlators/features/upcall/src/upcall.c @@ -2245,6 +2245,10 @@ upcall_local_init (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, { upcall_local_t *local = NULL; + GF_VALIDATE_OR_GOTO ("upcall", this, out); + GF_VALIDATE_OR_GOTO (this->name, frame, out); + GF_VALIDATE_OR_GOTO (this->name, inode, out); + local = mem_get0 (THIS->local_pool); if (!local) |