summaryrefslogtreecommitdiffstats
path: root/extras/Ubuntu/glusterd.conf
diff options
context:
space:
mode:
authorLouis Zuckerman <louiszuckerman@gmail.com>2012-02-07 11:16:10 -0500
committerAnand Avati <avati@redhat.com>2012-03-18 00:34:57 -0700
commitc3bbf6aa6c090fd066ab0079aa1c8ae332309d2a (patch)
treef831e975668e5c3855549ef5cc1c94e9e181517e /extras/Ubuntu/glusterd.conf
parent598ab12c30b44c4c5f5922f3b76eec2ed8872790 (diff)
Updated the Ubuntu upstart jobs for glusterd in extras/Ubuntu.
Using upstart jobs, instead of an initscript, solves Bug 765014. See also: https://bugs.launchpad.net/ubuntu/+source/glusterfs/+bug/876648 The new upstart jobs split the work of starting glusterd & mounting glusterfs volumes into two parts: a glusterd service runner and a glusterfs volume moung blocker which waits for the service runner. This is the method preferred by Ubuntu developers to block a mounting event until a required service is available. These changes will be included in the Ubuntu glusterfs-server package starting with release 12.04, Precise Pangolin. Tested on Ubuntu 12.04 Change-Id: I9bb4e8cb05a1da0997c23f2ef7fea8737f6a2eb9 BUG: 765014 Signed-off-by: Louis Zuckerman <louiszuckerman@gmail.com> Reviewed-on: http://review.gluster.com/2727 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Amar Tumballi <amarts@redhat.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'extras/Ubuntu/glusterd.conf')
-rw-r--r--extras/Ubuntu/glusterd.conf17
1 files changed, 5 insertions, 12 deletions
diff --git a/extras/Ubuntu/glusterd.conf b/extras/Ubuntu/glusterd.conf
index b987ffa13..aa99502b0 100644
--- a/extras/Ubuntu/glusterd.conf
+++ b/extras/Ubuntu/glusterd.conf
@@ -1,17 +1,10 @@
-# glusterd service upstart job
-#
-# Author: Louis Zuckerman <me@louiszuckerman.com>
+author "Louis Zuckerman <me@louiszuckerman.com>"
+description "GlusterFS Management Daemon"
-description "GlusterFS Management Daemon"
-
-start on (local-filesystems and net-device-up IFACE=lo and net-device-up IFACE=eth0) or (mounting TYPE=glusterfs)
+start on runlevel [2345]
stop on runlevel [016]
-respawn
-
-exec /usr/sbin/glusterd -N -p /var/run/glusterd.pid
+expect fork
-post-start script
- sleep 1
-end script
+exec /usr/sbin/glusterd -p /var/run/glusterd.pid