diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2015-06-16 23:53:32 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2015-06-25 09:24:39 -0700 |
| commit | a51d4670ce663b957d91443d313c48b5f44254e3 (patch) | |
| tree | df4d08569a918a5056b42fd56ee2993550072b1a | |
| parent | df77ac5088ebe1a1645489d77bdae77ce6cbc828 (diff) | |
snapshot: Fix terminating slash in brick mount path
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: 1232430
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/11262
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
| -rwxr-xr-x | tests/bugs/snapshot/bug-1232430.t | 22 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-store.c | 1 |
2 files changed, 22 insertions, 1 deletions
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 c4c6f740571..125d1430ee5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -3087,7 +3087,6 @@ glusterd_find_brick_mount_path (char *brick_path, char **brick_mount_path) ptr++; if (*ptr == '/') { - ptr++; *ptr = '\0'; } |