From 86589a9860e75f373dcd0440412e505b90cb9785 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Sat, 9 Apr 2016 11:20:28 -0700 Subject: [PATCH] Don't try to delete master during safe restart The master computer can be offline like any other slave but it cannot be deleted so do not try to delete it. Change-Id: I5b44f89cf2a8838bf2ea32bd5d7baaffe31f8451 --- files/safe_jenkins_shutdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/files/safe_jenkins_shutdown b/files/safe_jenkins_shutdown index 2fba93a..69f527b 100755 --- a/files/safe_jenkins_shutdown +++ b/files/safe_jenkins_shutdown @@ -24,7 +24,8 @@ def delete_offline_nodes(server, timeout): end = start + timeout while True: nodes = server.get_nodes() - offline_nodes = [node for node in nodes if node['offline']] + offline_nodes = [node for node in nodes if node['offline'] and + node['name'] != 'master'] if not offline_nodes: # We have converged to no offline nodes state break