[Pkg-ganeti-devel] [ganeti] 06/07: Fix luxid startup on new master on master failover

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos-guest pushed a commit to branch experimental
in repository ganeti.

commit 6feb171a564cc2ebc94b491630d1746d64c2c08b
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Thu Oct 17 11:34:15 2013 +0300

    Fix luxid startup on new master on master failover
    
    Import upstream patch from 2.8 series.
---
 ...n-util-handle-luxid-in-start-stop-_master.patch |   39 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/0001-daemon-util-handle-luxid-in-start-stop-_master.patch b/debian/patches/0001-daemon-util-handle-luxid-in-start-stop-_master.patch
new file mode 100644
index 0000000..56af7d7
--- /dev/null
+++ b/debian/patches/0001-daemon-util-handle-luxid-in-start-stop-_master.patch
@@ -0,0 +1,39 @@
+From 4036acdb976bcf80a4df64bda420b96e6c4849ce Mon Sep 17 00:00:00 2001
+From: Apollon Oikonomopoulos <apoikos at gmail.com>
+Date: Wed, 16 Oct 2013 12:17:23 +0300
+Subject: [PATCH] daemon-util: handle luxid in {start,stop}_master()
+
+Luxid was not handled in start_master() and stop_master() at all. As a result,
+during a master-failover, luxid would be left running on the old master and
+would not start on the new master, leaving the cluster without management until
+luxid was manually started.
+
+Signed-off-by: Apollon Oikonomopoulos <apoikos at gmail.com>
+Signed-off-by: Michele Tartara <mtartara at google.com>
+Reviewed-by: Michele Tartara <mtartara at google.com>
+---
+ daemons/daemon-util.in |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 44c39a9..f1e5941 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -292,12 +292,14 @@ check_and_start() {
+ start_master() {
+   start ganeti-masterd
+   start ganeti-rapi
++  _confd_enabled && start ganeti-luxid
+ }
+ 
+ # Stops the master role
+ stop_master() {
+   stop ganeti-rapi
+   stop ganeti-masterd
++  _confd_enabled && stop ganeti-luxid
+ }
+ 
+ # Start all daemons
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 7011cb7..4aaf28c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
+0001-daemon-util-handle-luxid-in-start-stop-_master.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git