From 58e807c2c80c16af539b0472af43b666ec3c2d08 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Fri, 12 Sep 2014 13:06:57 +0530 Subject: 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. Backport of http://review.gluster.org/#/c/8703/ Change-Id: I8686f144ed298124074f749e75c13028ec00be01 BUG: 1141187 Signed-off-by: Atin Mukherjee Reviewed-on: http://review.gluster.org/8703 Tested-by: Gluster Build System Reviewed-by: Justin Clift Reviewed-by: Xavier Hernandez Reviewed-by: Vijay Bellur Reviewed-on: http://review.gluster.org/8708 --- tests/include.rc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/include.rc b/tests/include.rc index 1beac4f8acd..9926c28e677 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -270,10 +270,13 @@ function cleanup() rm -rf $GLUSTERD_WORKDIR/* $B0/* /etc/glusterd/*; fi - umount -l $M0 2>/dev/null || true; - umount -l $M1 2>/dev/null || true; - umount -l $N0 2>/dev/null || true; - umount -l $N1 2>/dev/null || true; + # 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; + umount -l $N1 2>/dev/null || umount -f $N1 2>/dev/null || true; } -- cgit