[FIXED JENKINS-47139] Do not set Jenkins.version too early in startup…

…, lest InstallUtil.getLastExecVersion get confused.
jenkinsci · Sep 27, 2017 · 0792342 · 0792342
1 parent 34a8778
commit 0792342
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/core/src/main/java/jenkins/install/InstallUtil.java b/core/src/main/java/jenkins/install/InstallUtil.java
@@ -54,6 +54,7 @@
 import hudson.model.UpdateCenter.InstallationJob;
 import hudson.model.UpdateCenter.UpdateCenterJob;
 import hudson.util.VersionNumber;
+import java.util.logging.Level;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
 import jenkins.util.xml.XMLUtils;
@@ -256,6 +257,7 @@ public static void saveLastExecVersion() {
                 try {
                     String lastVersion = XMLUtils.getValue("/hudson/version", configFile);
                     if (lastVersion.length() > 0) {
+                        LOGGER.log(Level.FINE, "discovered serialized lastVersion {0}", lastVersion);
                         return lastVersion;
                     }
                 } catch (Exception e) {

diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -3191,7 +3191,13 @@ public void run(Reactor session) throws Exception {
      */
     public synchronized void save() throws IOException {
         if(BulkChange.contains(this))   return;
-        version = VERSION;
+
+        if (initLevel == InitMilestone.COMPLETED) {
+            LOGGER.log(FINE, "setting version {0} to {1}", new Object[] {version, VERSION});
+            version = VERSION;
+        } else {
+            LOGGER.log(FINE, "refusing to set version {0} to {1} during {2}", new Object[] {version, VERSION, initLevel});
+        }
 
         getConfigFile().write(this);
         SaveableListener.fireOnChange(this, getConfigFile());