From cd5578895e7a218518ed20eaa34c6d833ea65aaa Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Fri, 27 Aug 2010 04:49:34 +0000 Subject: 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 Signed-off-by: Vijay Bellur --- xlators/mgmt/glusterd/src/glusterd-handshake.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-handshake.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index 471fed3f1..95fe96e04 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: -- cgit