[Pkg-ganeti-devel] [ganeti] 01/01: Backport upstream commit ecff332, fixing luxid startup

[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 3d25ba845e501bd1a9222d9d3e0db5ad2eb00588
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Tue Aug 13 12:42:10 2013 +0300

    Backport upstream commit ecff332, fixing luxid startup
---
 ...0001-Use-FQDN-to-check-master-node-status.patch |   59 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 60 insertions(+)

diff --git a/debian/patches/0001-Use-FQDN-to-check-master-node-status.patch b/debian/patches/0001-Use-FQDN-to-check-master-node-status.patch
new file mode 100644
index 0000000..836b2e2
--- /dev/null
+++ b/debian/patches/0001-Use-FQDN-to-check-master-node-status.patch
@@ -0,0 +1,59 @@
+From ecff332f0af01dc49a72175eab4b290bf275a753 Mon Sep 17 00:00:00 2001
+From: Thomas Thrainer <thomasth at google.com>
+Date: Tue, 13 Aug 2013 09:50:42 +0200
+Subject: [PATCH] Use FQDN to check master node status
+
+The master node name in SS conf is stored as FQDN, so also use the FQDN
+on each node to check if it is the master node.
+
+This fixes issue 551.
+
+Signed-off-by: Thomas Thrainer <thomasth at google.com>
+Reviewed-by: Guido Trotter <ultrotter at google.com>
+---
+ src/Ganeti/Daemon.hs |   15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/Ganeti/Daemon.hs b/src/Ganeti/Daemon.hs
+index 6f9db4a..ada57eb 100644
+--- a/src/Ganeti/Daemon.hs
++++ b/src/Ganeti/Daemon.hs
+@@ -47,7 +47,7 @@ module Ganeti.Daemon
+ 
+ import Control.Exception
+ import Control.Monad
+-import Data.Maybe (fromMaybe)
++import Data.Maybe (fromMaybe, listToMaybe)
+ import Data.Word
+ import GHC.IO.Handle (hDuplicateTo)
+ import Network.BSD (getHostName)
+@@ -297,6 +297,17 @@ parseAddress opts defport = do
+ vClusterHostNameEnvVar :: String
+ vClusterHostNameEnvVar = "GANETI_HOSTNAME"
+ 
++getFQDN :: IO String
++getFQDN = do
++  hostname <- getHostName
++  addrInfos <- Socket.getAddrInfo Nothing (Just hostname) Nothing
++  let address = listToMaybe addrInfos >>= (Just . Socket.addrAddress)
++  case address of
++    Just a -> do
++      fqdn <- liftM fst $ Socket.getNameInfo [] True False a
++      return (fromMaybe hostname fqdn)
++    Nothing -> return hostname
++
+ -- | Returns if the current node is the master node.
+ isMaster :: IO Bool
+ isMaster = do
+@@ -307,7 +318,7 @@ isMaster = do
+                      ioErrorToNothing
+   curNode <- case vcluster_node of
+     Just node_name -> return node_name
+-    Nothing -> getHostName
++    Nothing -> getFQDN
+   masterNode <- Ssconf.getMasterNode Nothing
+   case masterNode of
+     Ok n -> return (curNode == n)
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2f2f409..8f8378f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
 disable-TestVerifyRestrictedCmdDirectory.patch
+0001-Use-FQDN-to-check-master-node-status.patch

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