diff options
Diffstat (limited to 'xlators/mgmt/glusterd/src')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handshake.c | 5 | ||||
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index 43a93731790..471fed3f1ce 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -56,10 +56,7 @@ build_volfile_path (const char *volname, char *path, ret = glusterd_volinfo_find (dup_volname, &volinfo); if (ret) { /* Split the volume name */ - vol = strtok_r (dup_volname, "-", &tmp); - if (!vol) - goto out; - vol = strtok_r (NULL, "-", &tmp); + vol = strtok_r (dup_volname, ".", &tmp); if (!vol) goto out; ret = glusterd_volinfo_find (vol, &volinfo); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 2132c56ff39..e8d9b4634c2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -762,8 +762,8 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, port = pmap_registry_alloc (THIS); GLUSTERD_GET_BRICK_PIDFILE (pidfile, path, brickinfo->hostname, count); - snprintf (volfile, PATH_MAX, "%s-%s-%d", brickinfo->hostname, - volinfo->volname, count); + snprintf (volfile, PATH_MAX, "%s.%s-%d", volinfo->volname, + brickinfo->hostname, count); snprintf (cmd_str, 8192, "%s/sbin/glusterfs --xlator-option server-*.listen-port=%d " |