summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtests/bugs/md-cache/bug-1211863_unlink.t45
-rw-r--r--tests/include.rc1
-rw-r--r--xlators/performance/md-cache/src/md-cache.c43
3 files changed, 84 insertions, 5 deletions
diff --git a/tests/bugs/md-cache/bug-1211863_unlink.t b/tests/bugs/md-cache/bug-1211863_unlink.t
new file mode 100755
index 00000000000..f83d3d7f83a
--- /dev/null
+++ b/tests/bugs/md-cache/bug-1211863_unlink.t
@@ -0,0 +1,45 @@
+#!/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};
+
+## Start the volume
+TEST $CLI volume start $V0
+
+## 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 performance.cache-invalidation on
+TEST $CLI volume set $V0 performance.md-cache-timeout 600
+TEST $CLI volume set $V0 performance.cache-samba-metadata on
+
+## Create two gluster mounts
+TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
+TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M1
+
+## Create files and directories from M0
+TEST mkdir $M0/dir1
+TEST touch $M0/dir1/file{1..5}
+
+## Lookup few files from M1, so that md-cache cahces
+TEST ls -l $M1/dir1/file2
+TEST ls -l $M1/dir1/file3
+
+## Remove the looked up file from M0
+TEST rm $M0/dir1/file2
+TEST mv $M0/dir1/file3 $M0/dir1/file6
+
+## Check if the files are not visible from M0
+EXPECT_WITHIN $MDC_TIMEOUT "N" path_exists $M0/dir1/file2
+EXPECT_WITHIN $MDC_TIMEOUT "N" path_exists $M0/dir1/file3
+EXPECT_WITHIN $MDC_TIMEOUT "Y" path_exists $M0/dir1/file6
+
+cleanup;
diff --git a/tests/include.rc b/tests/include.rc
index f088a8d7e4a..cdd1a1fa132 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -81,6 +81,7 @@ CONFIG_UPDATE_TIMEOUT=5
AUTH_REFRESH_INTERVAL=10
GRAPH_SWITCH_TIMEOUT=10
UNLINK_TIMEOUT=5
+MDC_TIMEOUT=5
LOGDIR=$(gluster --print-logdir)
diff --git a/xlators/performance/md-cache/src/md-cache.c b/xlators/performance/md-cache/src/md-cache.c
index 586a203398b..6359840f49d 100644
--- a/xlators/performance/md-cache/src/md-cache.c
+++ b/xlators/performance/md-cache/src/md-cache.c
@@ -831,6 +831,26 @@ out:
}
+static int
+mdc_update_gfid_stat (xlator_t *this, struct iatt *iatt)
+{
+ int ret = 0;
+ inode_table_t *itable = NULL;
+ inode_t *inode = NULL;
+
+ itable = ((xlator_t *)this->graph->top)->itable;
+ inode = inode_find (itable, iatt->ia_gfid);
+ if (!inode) {
+ ret = -1;
+ goto out;
+ }
+ ret = mdc_inode_iatt_set_validate (this, inode, NULL,
+ iatt);
+out:
+ return ret;
+}
+
+
void
mdc_load_reqs (xlator_t *this, dict_t *dict)
{
@@ -2521,12 +2541,24 @@ mdc_invalidate (xlator_t *this, void *data)
goto out;
}
+ if (up_ci->flags & UP_PARENT_DENTRY_FLAGS) {
+ mdc_update_gfid_stat (this, &up_ci->p_stat);
+ if (up_ci->flags & UP_RENAME_FLAGS)
+ mdc_update_gfid_stat (this, &up_ci->oldp_stat);
+ }
+
+ if ((up_ci->flags & (UP_NLINK | UP_RENAME_FLAGS | UP_FORGET)) ||
+ (up_ci->dict && dict_get (up_ci->dict, MDC_INVALIDATE_IATT))) {
+ mdc_inode_iatt_invalidate (this, inode);
+ mdc_inode_xatt_invalidate (this, inode);
+ INCREMENT_ATOMIC (conf->mdc_counter.lock,
+ conf->mdc_counter.stat_invals);
+ goto out;
+ }
+
if (up_ci->flags & IATT_UPDATE_FLAGS) {
- if (up_ci->dict && dict_get (up_ci->dict, MDC_INVALIDATE_IATT))
- mdc_inode_iatt_invalidate (this, inode);
- else
- ret = mdc_inode_iatt_set_validate (this, inode, NULL,
- &up_ci->stat);
+ ret = mdc_inode_iatt_set_validate (this, inode, NULL,
+ &up_ci->stat);
/* one of the scenarios where ret < 0 is when this invalidate
* is older than the current stat, in that case do not
* update the xattrs as well
@@ -2536,6 +2568,7 @@ mdc_invalidate (xlator_t *this, void *data)
INCREMENT_ATOMIC (conf->mdc_counter.lock,
conf->mdc_counter.stat_invals);
}
+
if (up_ci->flags & UP_XATTR) {
if (up_ci->dict)
ret = mdc_inode_xatt_update (this, inode, up_ci->dict);