summaryrefslogtreecommitdiffstats
path: root/glusterfsd
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-09-09 02:02:54 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-09 01:04:18 -0700
commit6faa7618225f6e5e8e43bf04dae05929c3c6453f (patch)
tree2a08ea58151796a2f64d2a955a8444a0bb1f576c /glusterfsd
parentf0121a3d7896ace6d3d525c41d13f695bc8e25c9 (diff)
glusterfsd: first time errors in volume file should exit the process
Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1551 (glusterfs process doesn't exit when init fails) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1551
Diffstat (limited to 'glusterfsd')
-rw-r--r--glusterfsd/src/glusterfsd.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index e3a7a9d..36fc86a 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -1313,6 +1313,12 @@ glusterfs_process_volfp (glusterfs_ctx_t *ctx, FILE *fp)
out:
if (fp)
fclose (fp);
+
+ if (ret && !ctx->active) {
+ /* there is some error in setting up the first graph itself */
+ cleanup_and_exit (0);
+ }
+
return ret;
}