From d90307c1b0245e0e6a39044a28819cde520a100c Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Mon, 18 Jul 2016 11:12:43 +0530 Subject: xlator/trash : append '/' at the end in trash_notify_lookup_cbk In the notify function in trash xlator, a lookup is performed to obtain path of old trash directory. The result usually contains path without '/' at the end. The trash xlator maintains expects '/' at the end for the values such as 'old trash dir' and 'new trash dir'. Otherwise certian checks in the code will fail. Change-Id: I89e02e4b249314fb6536297f959865feee182c83 BUG: 1357397 Signed-off-by: Jiffin Tony Thottan Reviewed-on: http://review.gluster.org/14938 Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Anoop C S NetBSD-regression: NetBSD Build System Reviewed-by: Jeff Darcy --- tests/bugs/unclassified/bug-1357397.t | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 tests/bugs/unclassified/bug-1357397.t (limited to 'tests') diff --git a/tests/bugs/unclassified/bug-1357397.t b/tests/bugs/unclassified/bug-1357397.t new file mode 100644 index 00000000000..dc76787b505 --- /dev/null +++ b/tests/bugs/unclassified/bug-1357397.t @@ -0,0 +1,29 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc + +cleanup + +TEST glusterd +TEST pidof glusterd + +TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2} + +TEST $CLI volume start $V0 + +TEST [ -e $B0/${V0}1/.trashcan ] + +TEST [ -e $B0/${V0}1/.trashcan/internal_op ] + +TEST $CLI volume stop $V0 + +rm -rf $B0/${V0}1/.trashcan/internal_op + +TEST [ ! -e $B0/${V0}1/.trashcan/internal_op ] + +TEST $CLI volume start $V0 force + +TEST [ -e $B0/${V0}1/.trashcan/internal_op ] + +cleanup -- cgit