diff options
| author | Louis Zuckerman <me@louiszuckerman.com> | 2013-12-28 00:34:47 -0500 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-01-01 16:58:24 -0800 |
| commit | bf770361e9e7121f2ba1524ba02f41fbf12d44e8 (patch) | |
| tree | 28bfc140804d17fbf420689896a5207839961bfe | |
| parent | b2ee85b3e452678c330c25bf32c522090bb320fc (diff) | |
Updating extras/Ubuntu with latest upstart configs (BUG: 1047007)
Change-Id: Ia769589f6af1d7ca3577185fd4c56eb9f43b3e2e
BUG: 1047007
Signed-off-by: Louis Zuckerman <me@louiszuckerman.com>
Reviewed-on: http://review.gluster.org/6611
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Reviewed-on: http://review.gluster.org/6622
| -rw-r--r-- | extras/Ubuntu/README.Ubuntu | 14 | ||||
| -rw-r--r-- | extras/Ubuntu/glusterfs-server.conf (renamed from extras/Ubuntu/glusterd.conf) | 0 | ||||
| -rw-r--r-- | extras/Ubuntu/mounting-glusterfs.conf | 5 |
3 files changed, 10 insertions, 9 deletions
diff --git a/extras/Ubuntu/README.Ubuntu b/extras/Ubuntu/README.Ubuntu index 0c5b7828d..40f194ba2 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/glusterfs-server.conf index aa99502b0..aa99502b0 100644 --- a/extras/Ubuntu/glusterd.conf +++ b/extras/Ubuntu/glusterfs-server.conf diff --git a/extras/Ubuntu/mounting-glusterfs.conf b/extras/Ubuntu/mounting-glusterfs.conf index 3c59c0f63..786ef16df 100644 --- a/extras/Ubuntu/mounting-glusterfs.conf +++ b/extras/Ubuntu/mounting-glusterfs.conf @@ -1,7 +1,6 @@ author "Louis Zuckerman <me@louiszuckerman.com>" -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 |