The upgrade process starts with a verify version, so there's no need to do a second one after stopping the master daemons.
This saves one round of sequential ssh into each cluster node. While here, report that we're doing that first version check rather than seeming to pause silently when the upgrade starts. Signed-off-by: Brian Foley <[email protected]> --- lib/client/gnt_cluster.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py index 4acb02e..cc21698 100644 --- a/lib/client/gnt_cluster.py +++ b/lib/client/gnt_cluster.py @@ -2149,6 +2149,7 @@ def _UpgradeBeforeConfigurationChange(versionstring): """ rollback = [] + ToStdoutAndLoginfo("Verifying %s present on all nodes", versionstring) if not _VerifyVersionInstalled(versionstring): return (False, rollback) @@ -2176,10 +2177,6 @@ def _UpgradeBeforeConfigurationChange(versionstring): if not _RunCommandAndReport([pathutils.DAEMON_UTIL, "stop-all"]): return (False, rollback) - if not _VerifyVersionInstalled(versionstring): - utils.RunCmd([pathutils.DAEMON_UTIL, "start-all"]) - return (False, rollback) - ToStdoutAndLoginfo("Stopping daemons everywhere.") rollback.append(lambda: _VerifyCommand([pathutils.DAEMON_UTIL, "start-all"])) badnodes = _VerifyCommand([pathutils.DAEMON_UTIL, "stop-all"]) -- 2.8.0.rc3.226.g39d4020
