summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-handshake.c
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-08-27 04:49:34 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-08-27 05:53:55 -0700
commitcd5578895e7a218518ed20eaa34c6d833ea65aaa (patch)
tree2c5a91b0462c729d522ba842b0dcb7a01a194192 /xlators/mgmt/glusterd/src/glusterd-handshake.c
parent07873893ad88e961cd0736872700f2bdc746d49c (diff)
mgmt/glusterd: fixes in volgen file paths
* fixed argument to few xlator options generated by volgen * commented out many options which we want to be default * pid file and volume file name to contain export path info in them Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handshake.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handshake.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c
index 471fed3f1ce..95fe96e04a4 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handshake.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c
@@ -69,9 +69,15 @@ build_volfile_path (const char *volname, char *path,
goto out;
ret = stat (path, &stbuf);
- if ((ret == -1) && (errno == ENOENT))
+ if ((ret == -1) && (errno == ENOENT)) {
+ ret = snprintf (path, path_len, "%s/vols/%s/%s-fuse.vol",
+ priv->workdir, volinfo->volname, volname);
+ ret = stat (path, &stbuf);
+ }
+ if ((ret == -1) && (errno == ENOENT)) {
ret = snprintf (path, path_len, "%s/vols/%s/%s-tcp.vol",
priv->workdir, volinfo->volname, volname);
+ }
ret = 1;
out: