From 401b773e6e237e8f6e0e78a92e8f75a4b3e98fa1 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Fri, 31 Jan 2014 10:40:27 +0100 Subject: [PATCH] upgrade: start daemons after ensure-dirs On upgrading a cluster, we only can rely on daemons starting up cleanly, if all needed directories are generated first. So ensure-dirs needs to be run first. Signed-off-by: Klaus Aehlig Reviewed-by: Petr Pudlak --- lib/client/gnt_cluster.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py index 0ea78ef..8d87a4c 100644 --- a/lib/client/gnt_cluster.py +++ b/lib/client/gnt_cluster.py @@ -1924,12 +1924,6 @@ def _UpgradeAfterConfigurationChange(oldversion): """ returnvalue = 0 - ToStdout("Starting daemons everywhere.") - badnodes = _VerifyCommand([pathutils.DAEMON_UTIL, "start-all"]) - if badnodes: - ToStderr("Warning: failed to start daemons on %s." % (", ".join(badnodes),)) - returnvalue = 1 - ToStdout("Ensuring directories everywhere.") badnodes = _VerifyCommand([pathutils.ENSURE_DIRS]) if badnodes: @@ -1937,6 +1931,12 @@ def _UpgradeAfterConfigurationChange(oldversion): (", ".join(badnodes))) returnvalue = 1 + ToStdout("Starting daemons everywhere.") + badnodes = _VerifyCommand([pathutils.DAEMON_UTIL, "start-all"]) + if badnodes: + ToStderr("Warning: failed to start daemons on %s." % (", ".join(badnodes),)) + returnvalue = 1 + ToStdout("Redistributing the configuration.") if not _RunCommandAndReport(["gnt-cluster", "redist-conf", "--yes-do-it"]): returnvalue = 1 -- 1.7.10.4