From c2e67ea0b7faa5f8a5875aaf7563e8658e392d96 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Tue, 11 Jun 2019 09:52:06 +0530 Subject: glusterd: add GF_TRANSPORT_BOTH_TCP_RDMA in glusterd_get_gfproxy_client_volfile ... with out which volume creation fails with "volume create: : failed: Failed to create volume files" >Fixes: bz#1716812 >Change-Id: I2f4c2c6d5290f066b54e1c1db19e25db9937bedb >Signed-off-by: Atin Mukherjee Fixes: bz#1721106 Change-Id: I2f4c2c6d5290f066b54e1c1db19e25db9937bedb Signed-off-by: Atin Mukherjee --- tests/bugs/glusterd/optimized-basic-testcases.t | 4 +++- xlators/mgmt/glusterd/src/glusterd-utils.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/bugs/glusterd/optimized-basic-testcases.t b/tests/bugs/glusterd/optimized-basic-testcases.t index dd98a65fa9a..9cad4113140 100644 --- a/tests/bugs/glusterd/optimized-basic-testcases.t +++ b/tests/bugs/glusterd/optimized-basic-testcases.t @@ -276,7 +276,9 @@ TEST ! $CLI volume create "test" $H0:/var/lib/glusterd force TEST ! $CLI volume create "test" $H0:/var/lib/glusterd/abc TEST ! $CLI volume create "test" $H0:/var/lib/glusterd/abc force mkdir -p /xyz/var/lib/glusterd/abc -TEST $CLI volume create "test" $H0:/xyz/var/lib/glusterd/abc + +#bug 1716812 - volfile should be created with transport type both +TEST $CLI volume create "test" transport tcp,rdma $H0:/xyz/var/lib/glusterd/abc EXPECT 'Created' volinfo_field "test" 'Status'; cleanup diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 2a4ff542c13..2edc6a7bd5f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -12815,6 +12815,7 @@ glusterd_get_gfproxy_client_volfile(glusterd_volinfo_t *volinfo, char *path, 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); break; -- cgit