From bf770361e9e7121f2ba1524ba02f41fbf12d44e8 Mon Sep 17 00:00:00 2001 From: Louis Zuckerman Date: Sat, 28 Dec 2013 00:34:47 -0500 Subject: Updating extras/Ubuntu with latest upstart configs (BUG: 1047007) Change-Id: Ia769589f6af1d7ca3577185fd4c56eb9f43b3e2e BUG: 1047007 Signed-off-by: Louis Zuckerman Reviewed-on: http://review.gluster.org/6611 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur Reviewed-on: http://review.gluster.org/6622 --- extras/Ubuntu/README.Ubuntu | 14 ++++++++------ extras/Ubuntu/glusterd.conf | 10 ---------- extras/Ubuntu/glusterfs-server.conf | 10 ++++++++++ extras/Ubuntu/mounting-glusterfs.conf | 5 ++--- 4 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 extras/Ubuntu/glusterd.conf create mode 100644 extras/Ubuntu/glusterfs-server.conf diff --git a/extras/Ubuntu/README.Ubuntu b/extras/Ubuntu/README.Ubuntu index 0c5b7828d12..40f194ba2ad 100644 --- a/extras/Ubuntu/README.Ubuntu +++ b/extras/Ubuntu/README.Ubuntu @@ -1,5 +1,6 @@ Bug 765014 - Mounting from localhost in fstab fails at boot on ubuntu -(https://bugzilla.redhat.com/show_bug.cgi?id=765014) +(original bug: https://bugzilla.redhat.com/show_bug.cgi?id=765014) +(updated in: https://bugzilla.redhat.com/show_bug.cgi?id=1047007) (https://bugs.launchpad.net/ubuntu/+source/glusterfs/+bug/876648) Ubuntu uses upstart instead of init to bootstrap the system and it has a unique @@ -10,15 +11,16 @@ and the volume is mounted from localhost, the mount fails at boot time. To correct this we need to launch glusterd using upstart and block the glusterfs mounting event until glusterd is started. -The glusterd.conf file contains the necessary configuration for upstart to -manage the glusterd service. It should be placed in /etc/init/glusterd.conf +The glusterfs-server.conf file contains the necessary configuration for upstart to +manage the glusterd service. It should be placed in /etc/init/glusterfs-server.conf on Ubuntu systems, and then the old initscript /etc/init.d/glusterd can be removed. An additional upstart job, mounting-glusterfs.conf, is also required -to block mounting glusterfs volumes until the glusterd service is available. +to block mounting glusterfs volumes until the network interfaces are available. Both of these upstart jobs need to be placed in /etc/init to resolve the issue. -Starting with Ubuntu 12.04, Precise Pangolin, these upstart jobs will be -included with the glusterfs-server package in the Ubuntu repository. +Starting with Ubuntu 14.04, Trusty Tahr, these upstart jobs will be included +with the glusterfs-server and glusterfs-client packages in the Ubuntu +universe repository. This affects all versions of glusterfs on the Ubuntu platform since at least 10.04, Lucid Lynx. diff --git a/extras/Ubuntu/glusterd.conf b/extras/Ubuntu/glusterd.conf deleted file mode 100644 index aa99502b0a7..00000000000 --- a/extras/Ubuntu/glusterd.conf +++ /dev/null @@ -1,10 +0,0 @@ -author "Louis Zuckerman " -description "GlusterFS Management Daemon" - -start on runlevel [2345] -stop on runlevel [016] - -expect fork - -exec /usr/sbin/glusterd -p /var/run/glusterd.pid - diff --git a/extras/Ubuntu/glusterfs-server.conf b/extras/Ubuntu/glusterfs-server.conf new file mode 100644 index 00000000000..aa99502b0a7 --- /dev/null +++ b/extras/Ubuntu/glusterfs-server.conf @@ -0,0 +1,10 @@ +author "Louis Zuckerman " +description "GlusterFS Management Daemon" + +start on runlevel [2345] +stop on runlevel [016] + +expect fork + +exec /usr/sbin/glusterd -p /var/run/glusterd.pid + diff --git a/extras/Ubuntu/mounting-glusterfs.conf b/extras/Ubuntu/mounting-glusterfs.conf index 3c59c0f635e..786ef16df04 100644 --- a/extras/Ubuntu/mounting-glusterfs.conf +++ b/extras/Ubuntu/mounting-glusterfs.conf @@ -1,7 +1,6 @@ author "Louis Zuckerman " -description "Block the mounting event for glusterfs filesystems until glusterd is running" +description "Block the mounting event for glusterfs filesystems until the network interfaces are running" start on mounting TYPE=glusterfs task -exec start wait-for-state WAIT_FOR=glusterd WAITER=mounting-glusterfs - +exec start wait-for-state WAIT_FOR=static-network-up WAITER=mounting-glusterfs -- cgit