summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handshake.c22
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c4
2 files changed, 22 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c
index f2f5178a456..8c9194e1961 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handshake.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c
@@ -158,7 +158,8 @@ build_volfile_path (char *volume_id, char *path,
char *free_ptr = NULL;
char *volname = NULL;
char *volid_ptr = NULL;
- char path_prefix [PATH_MAX] = {0,};
+ char dup_volid[PATH_MAX] = {0,};
+ char path_prefix[PATH_MAX] = {0,};
xlator_t *this = NULL;
glusterd_volinfo_t *volinfo = NULL;
glusterd_conf_t *priv = NULL;
@@ -275,10 +276,27 @@ gotvolinfo:
ret = stat (path, &stbuf);
if ((ret == -1) && (errno == ENOENT)) {
+ strcpy (dup_volid, volid_ptr);
+ if (!strchr (dup_volid, '.')) {
+ switch (volinfo->transport_type) {
+ case GF_TRANSPORT_TCP:
+ strcat (dup_volid, ".tcp");
+ break;
+ case GF_TRANSPORT_RDMA:
+ strcat (dup_volid, ".rdma");
+ break;
+ case GF_TRANSPORT_BOTH_TCP_RDMA:
+ strcat (dup_volid, ".tcp");
+ break;
+ default:
+ ret = -1;
+ break;
+ }
+ }
snprintf (path, path_len, "%s/%s/%s%s-fuse.vol",
path_prefix, volinfo->volname,
(trusted_str ? trusted_str : ""),
- volid_ptr);
+ dup_volid);
ret = stat (path, &stbuf);
}
out:
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 85d716e2e18..e285a499a5c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -9067,7 +9067,7 @@ glusterd_get_client_filepath (char *filepath, glusterd_volinfo_t *volinfo,
switch (type) {
case GF_TRANSPORT_TCP:
snprintf (filepath, PATH_MAX,
- "%s/%s-fuse.vol", path, volinfo->volname);
+ "%s/%s.tcp-fuse.vol", path, volinfo->volname);
break;
case GF_TRANSPORT_RDMA:
@@ -9097,7 +9097,7 @@ glusterd_get_trusted_client_filepath (char *filepath,
switch (type) {
case GF_TRANSPORT_TCP:
- snprintf (filepath, PATH_MAX, "%s/trusted-%s-fuse.vol",
+ snprintf (filepath, PATH_MAX, "%s/trusted-%s.tcp-fuse.vol",
path, volinfo->volname);
break;