[JENKINS-30556] Cannot reconnect to running slaves after jenkins restart

jenkinsci · Oct 3, 2015 · 5814b4d · 5814b4d
1 parent c1dd46a
commit 5814b4d
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlave.java b/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlave.java
@@ -1,6 +1,7 @@
 package jenkins.plugins.jclouds.compute;
 
 import hudson.Extension;
+import hudson.XmlFile;
 import hudson.model.TaskListener;
 import hudson.model.Descriptor;
 import hudson.slaves.AbstractCloudComputer;
@@ -9,6 +10,9 @@
 import hudson.slaves.ComputerLauncher;
 import hudson.slaves.RetentionStrategy;
 
+import jenkins.model.Jenkins;
+
+import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Collections;
@@ -215,8 +219,31 @@ public boolean isWaitPhoneHome() {
         return waitPhoneHome;
     }
 
+    /*
+     * This is extremely ugly!
+     * There should be a Jenkins#updateNode(Node) instead of just addNode() and removeNode().
+     * We MUST persist the value of the waitPhoneHome flag, because otherwise if jenkins is
+     * restarted after a node has successfully phoned home and that node is still running,
+     * jenkins would then repeat the whole thing, obviously timing out when the node does not
+     * phone home again.
+     * Another solution would be for jenkins to simply persist all nodes once before restarting.
+     */
+    private void updateXml() {
+        final File nodesDir = new File(Jenkins.getActiveInstance().getRootDir(), "nodes");
+        final File cfg = new File(new File(nodesDir, getNodeName()), "config.xml");
+        if (cfg.exists()) {
+            XmlFile xmlFile = new XmlFile(Jenkins.XSTREAM, cfg);
+            try {
+                xmlFile.write(this);
+            } catch (IOException e) {
+                LOGGER.warning(e.getMessage());
+            }
+        }
+    }
+
     public void setWaitPhoneHome(boolean value) {
         waitPhoneHome = value;
+        updateXml();
         phm.signalCondition();
     }