summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2014-09-12 13:06:57 +0530
committerVijay Bellur <vbellur@redhat.com>2014-09-12 03:27:47 -0700
commitf1fecf5fb3ff34945bbacd0b4806bc57b9ddc355 (patch)
tree09c4c89ab775b49b20e670419ce5a4c0951be8f1
parent51becaa5e803bd21807f30524da58a578061541b (diff)
test: cleanup should clean all left over (stale) mounts
This is a temporary work around to fix the spurious failures seen in ec testcases. As per the initial analysis it looks like quota (glusterd_quota_initiate_fs_crawl) is causing a mount point in /tmp to be stale. Once the root cause is identified this fix can be reverted as well. Change-Id: I8686f144ed298124074f749e75c13028ec00be01 BUG: 1092850 Signed-off-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-on: http://review.gluster.org/8703 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Justin Clift <justin@gluster.org> Reviewed-by: Xavier Hernandez <xhernandez@datalab.es> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--tests/include.rc3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/include.rc b/tests/include.rc
index 64a9d34dc99..98c449387e5 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -409,6 +409,9 @@ function cleanup()
rm -rf $GLUSTERD_WORKDIR/* $B0/* /etc/glusterd/*;
fi
+ # unmount all stale mounts from /tmp, This is a temporary work around
+ # till the stale mount in /tmp is found.
+ umount -l /tmp/mnt* 2>/dev/null
umount -l $M0 2>/dev/null || umount -f $M0 2>/dev/null || true;
umount -l $M1 2>/dev/null || umount -f $M1 2>/dev/null || true;
umount -l $N0 2>/dev/null || umount -f $N0 2>/dev/null || true;