diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2017-10-12 14:31:14 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2017-10-15 14:43:02 +0000 |
| commit | 067f38063e13fc75d4e3f7adf93441d15099c557 (patch) | |
| tree | 95916c8eb6d748daaa411cb475190552f3214074 | |
| parent | 68d80f44a3a33050241b025476c8e171018f0edf (diff) | |
mount/fuse : Fix parsing of vol_id for snapshot volume
For supporting sub-dir mount, we changed the volid. Which means anything
after a '/' in volume_id will be considered as sub-dir path.
But snapshot volume has vol_id stracture of /snaps/<volname>/<snapname>
which has to be considered as during the parsing.
Note 1: sub-dir mount is not supported on snapshot volume
Note 2: With sub-dir mount changes brick based mount for quota cannot be
executed via mount command. It has to be a direct call via glusterfs
Change-Id: I0d824de0236b803db8a918f683dabb0cb523cb04
BUG: 1501235
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
| -rwxr-xr-x | xlators/mount/fuse/utils/mount.glusterfs.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in index c6f2dda8e9a..c9ffbe352f0 100755 --- a/xlators/mount/fuse/utils/mount.glusterfs.in +++ b/xlators/mount/fuse/utils/mount.glusterfs.in @@ -684,8 +684,10 @@ main () [ ${first_char} = '/' ] && { volume_str_temp=$(echo "$volume_str" | cut -c 2-) } - [ $(echo $volume_str_temp | grep -c "/") -eq 1 ] && { - volume_id=$(echo "$volume_str_temp" | cut -f1 -d '/'); + volume_id_temp=$(echo "$volume_str_temp" | cut -f1 -d '/'); + [ $(echo $volume_str_temp | grep -c "/") -eq 1 ] && + [ "$volume_id_temp" != "snaps" ] && { + volume_id=$volume_id_temp; subdir_mount=$(echo "$volume_str_temp" | cut -f2- -d '/'); } } |