From 5a3f91bc2140a53e1e6a7d98aed939a01f18f034 Mon Sep 17 00:00:00 2001 From: vmallika Date: Mon, 17 Nov 2014 07:14:28 +0530 Subject: gluster/uss: Don't send failure when accessing snap with name same as entry-point name. In a scenario, if the snap name is same as the snap-directory than cd to snaps/snaps fails. Send a lookup to snap-view server instead of failing Change-Id: Ie7b811815ff30961500592bbc8cdb514a9d76ef5 BUG: 1175733 Signed-off-by: vmallika Reviewed-on: http://review.gluster.org/9135 Tested-by: Gluster Build System Reviewed-by: Rajesh Joseph Reviewed-by: Avra Sengupta Reviewed-by: Krishnan Parthasarathi Tested-by: Krishnan Parthasarathi Signed-off-by: Sachin Pandit Reviewed-on: http://review.gluster.org/9306 Reviewed-by: Raghavendra Bhat --- tests/bugs/bug-1164613.t | 34 ++++++++++++++++++++++++++++++++++ tests/include.rc | 6 ++++++ 2 files changed, 40 insertions(+) create mode 100644 tests/bugs/bug-1164613.t (limited to 'tests') diff --git a/tests/bugs/bug-1164613.t b/tests/bugs/bug-1164613.t new file mode 100644 index 00000000000..b7b27f1d649 --- /dev/null +++ b/tests/bugs/bug-1164613.t @@ -0,0 +1,34 @@ +#!/bin/bash + +. $(dirname $0)/../include.rc +. $(dirname $0)/../snapshot.rc + +cleanup; +TEST verify_lvm_version; +TEST glusterd; +TEST pidof glusterd; + +TEST setup_lvm 1 + +TEST $CLI volume create $V0 $H0:$L1 +TEST $CLI volume start $V0 +TEST glusterfs -s $H0 --volfile-id=$V0 $M0 + +TEST touch $M0/testfile + +TEST $CLI snapshot create snaps $V0 +TEST $CLI snapshot activate snaps +TEST $CLI volume set $V0 features.uss enable +TEST $CLI volume set $V0 snapshot-directory snaps + +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $M0/snaps/snaps/testfile + +umount -f $M0 + +#Clean up +TEST $CLI snapshot delete snaps +TEST $CLI volume stop $V0 force +TEST $CLI volume delete $V0 + +cleanup; + diff --git a/tests/include.rc b/tests/include.rc index 5640ab08fbe..599ad1bd4c2 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -325,6 +325,12 @@ function process_leak_count () return $(ls -lh /proc/$pid/fd | grep "(deleted)"| wc -l) } +function STAT() +{ + stat $1 + echo $? +} + alias EXPECT='_EXPECT $LINENO' alias EXPECT_NOT='_EXPECT_NOT $LINENO' alias TEST='_TEST $LINENO' -- cgit