Add new “daemon-util” script to start/stop Ganeti daemons

[ganeti-local] / daemons / ganeti-watcher

diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index e77db0c..c09e7a4 100755 (executable)
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -78,28 +78,17 @@ def ShouldPause():
   return bool(utils.ReadWatcherPauseFile(constants.WATCHER_PAUSEFILE))
 
 
-def StartMaster():
-  """Try to start the master daemon.
+def EnsureDaemon(name):
+  """Check for and start daemon if not alive.
 
   """
-  result = utils.RunCmd(['ganeti-masterd'])
+  result = utils.RunCmd([constants.DAEMON_UTIL, "check-and-start", name])
   if result.failed:
-    logging.error("Can't start the master daemon: output '%s'", result.output)
-  return not result.failed
-
+    logging.error("Can't start daemon '%s', failure %s, output: %s",
+                  name, result.fail_reason, result.output)
+    return False
 
-def EnsureDaemon(daemon):
-  """Check for and start daemon if not alive.
-
-  """
-  pidfile = utils.DaemonPidFileName(daemon)
-  pid = utils.ReadPidFile(pidfile)
-  if pid == 0 or not utils.IsProcessAlive(pid): # no file or dead pid
-    logging.debug("Daemon '%s' not alive, trying to restart", daemon)
-    result = utils.RunCmd([daemon])
-    if not result:
-      logging.error("Can't start daemon '%s', failure %s, output: %s",
-                    daemon, result.fail_reason, result.output)
+  return True
 
 
 class WatcherState(object):
@@ -503,7 +492,7 @@ def main():
       except luxi.NoMasterError, err:
         logging.warning("Master seems to be down (%s), trying to restart",
                         str(err))
-        if not StartMaster():
+        if not EnsureDaemon(constants.MASTERD):
           logging.critical("Can't start the master, exiting")
           sys.exit(constants.EXIT_FAILURE)
         # else retry the connection