From 9230ae2bd02672a91e61b3ea98a2c2a662f21862 Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Tue, 16 Jun 2015 23:53:32 +0530 Subject: snapshot: Fix terminating slash in brick mount path Backport of http://review.gluster.org/#/c/11262/ glusterd_find_brick_mount_path(), returns mount path, with a terminating '/' at the ned of the string in cases where the brick dir is a dir in the lvm root dir. Ignoring the terminating '/' fixes the issue. Change-Id: Ie7e63d37d48e2e03d541ae0076b8f143b8c9112f BUG: 1232887 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/11294 Reviewed-by: Atin Mukherjee Tested-by: NetBSD Build System Reviewed-by: Rajesh Joseph --- tests/bugs/snapshot/bug-1232430.t | 22 ++++++++++++++++++++++ xlators/mgmt/glusterd/src/glusterd-store.c | 1 - 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 tests/bugs/snapshot/bug-1232430.t diff --git a/tests/bugs/snapshot/bug-1232430.t b/tests/bugs/snapshot/bug-1232430.t new file mode 100755 index 00000000000..50411b1dbfc --- /dev/null +++ b/tests/bugs/snapshot/bug-1232430.t @@ -0,0 +1,22 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../snapshot.rc + +cleanup; +TEST verify_lvm_version; +TEST glusterd -LDEBUG; +TEST pidof glusterd; + +TEST setup_lvm 1 + +TEST $CLI volume create $V0 $H0:$L1/brick_dir +TEST $CLI volume start $V0 + +TEST $CLI snapshot create snap1 $V0 no-timestamp + +TEST $CLI snapshot delete snap1 + +TEST $CLI volume stop $V0 force +TEST $CLI volume delete $V0 +cleanup diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 690023bdb3c..d865f5db0ce 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -3092,7 +3092,6 @@ glusterd_find_brick_mount_path (char *brick_path, char **brick_mount_path) ptr++; if (*ptr == '/') { - ptr++; *ptr = '\0'; } -- cgit