summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammed Rafi KC <rkavunga@redhat.com>2014-11-19 17:22:21 +0530
committerRaghavendra G <rgowdapp@redhat.com>2014-11-21 04:48:56 -0800
commit0dd772d13853ad862270dea74ad671118ee51813 (patch)
tree78fd928a8694048e4f529823d0550e3423b02e51
parent7d0bfc90027c824e6d49cba7c3c3dc818f9c365b (diff)
mount:Handle -o transport option in mount.glusterfs
In current scenario ,when tcp transport type(default) specified for mounting,glusterfs mount script won't append '.tcp' to volume name.But to accommodate the change in http://review.gluster.org/#/c/9146/, we need to append ".tcp" with volfile-id if '-o transport=tcp' is given. Change-Id: I506edeb339de062087f820f10e17c7d67b8b63fe BUG: 1164079 Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com> Reviewed-on: http://review.gluster.org/9147 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com> Reviewed-by: Raghavendra Talur <rtalur@redhat.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Tested-by: Raghavendra G <rgowdapp@redhat.com>
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in18
1 files changed, 5 insertions, 13 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index d491cc33c89..68d452c142e 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -232,9 +232,8 @@ start_glusterfs ()
cmd_line=$(echo "$cmd_line --xlator-option=$xlator_option");
fi
- # for rdma volume, we have to fetch volfile with '.rdma' added
- # to volume name, so that it fetches the right client vol file
- volume_id_rdma="";
+ # if trasnport type is specified, we have to append it to
+ # volume name, so that it fetches the right client vol file
if [ -z "$volfile_loc" ]; then
if [ -n "$server_ip" ]; then
@@ -272,16 +271,10 @@ start_glusterfs ()
cmd_line=$(echo "$cmd_line --volfile-server-port=$server_port");
fi
- if [ -n "$transport" ]; then
- cmd_line=$(echo "$cmd_line --volfile-server-transport=$transport");
- if [ "$transport" = "rdma" ]; then
- volume_id_rdma=".rdma";
- fi
- fi
-
if [ -n "$volume_id" ]; then
- if [ -n "$volume_id_rdma" ]; then
- volume_id="$volume_id$volume_id_rdma";
+ if [ -n "$transport" ]; then
+ volume_id="$volume_id.$transport";
+ cmd_line=$(echo "$cmd_line --volfile-server-transport=$transport");
fi
cmd_line=$(echo "$cmd_line --volfile-id=$volume_id");
fi
@@ -295,7 +288,6 @@ start_glusterfs ()
fi
cmd_line=$(echo "$cmd_line $mount_point");
-
$cmd_line;
if [ $? -ne 0 ]; then
warn "Mount failed. Please check the log file for more details."