summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2019-06-11 09:52:06 +0530
committerSanju Rakonde <sanjurakonde@review.gluster.org>2019-06-18 10:43:51 +0000
commit91383c7c7ab05cfc6c38a7a92cfe94bec55880ac (patch)
treedd88ed90ed1b2e25f4365a55979d1918248f6a59
parent735237b0ee3508ceb7ec288fb46c7e1a93492132 (diff)
glusterd: add GF_TRANSPORT_BOTH_TCP_RDMA in glusterd_get_gfproxy_client_volfile
... with out which volume creation fails with "volume create: <xyz>: failed: Failed to create volume files" >Fixes: bz#1716812 >Change-Id: I2f4c2c6d5290f066b54e1c1db19e25db9937bedb >Signed-off-by: Atin Mukherjee <amukherj@redhat.com> BUG: 1721109 Change-Id: I2f4c2c6d5290f066b54e1c1db19e25db9937bedb Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
-rw-r--r--tests/bugs/glusterd/optimized-basic-testcases.t5
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/bugs/glusterd/optimized-basic-testcases.t b/tests/bugs/glusterd/optimized-basic-testcases.t
index b9fba4cdefb..47c5ec2f448 100644
--- a/tests/bugs/glusterd/optimized-basic-testcases.t
+++ b/tests/bugs/glusterd/optimized-basic-testcases.t
@@ -269,5 +269,10 @@ pkill glusterd;
pkill glusterfsd;
TEST glusterd
TEST $CLI volume status $V1
+TEST $CLI volume stop $V1
+TEST $CLI volume delete $V1
+
+#bug 1721109 - volfile should be created with transport type both
+TEST $CLI volume create $V1 transport tcp,rdma $H0:$B0/${V1}2
cleanup
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 30288e32fe6..110e295d841 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -12760,6 +12760,7 @@ glusterd_get_gfproxy_client_volfile (glusterd_volinfo_t *volinfo,
switch (volinfo->transport_type) {
case GF_TRANSPORT_TCP:
+ case GF_TRANSPORT_BOTH_TCP_RDMA:
snprintf (path, path_len,
"%s/trusted-%s.tcp-gfproxy-fuse.vol",
workdir, volinfo->volname);