Extend startup notification timeout as each initialization milestone …

…is attained (jenkinsci#6237)

(cherry picked from commit 3866e93)

core/src/main/java/hudson/lifecycle/Lifecycle.java

@@ -34,6 +34,7 @@
 import java.io.UncheckedIOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
@@ -276,6 +277,16 @@ public void onStop(@NonNull String user, @CheckForNull String remoteAddr) {
         }
     }
 
+    /**
+     * Tell the service manager to extend the startup or shutdown timeout. The value specified is a
+     * time during which either {@link #onExtendTimeout(long, TimeUnit)} must be called again or
+     * startup/shutdown must complete.
+     *
+     * @param timeout The amount by which to extend the timeout.
+     * @param unit The time unit of the timeout argument.
+     */
+    public void onExtendTimeout(long timeout, @NonNull TimeUnit unit) {}
+
     /**
      * Called when Jenkins service state has changed.
      *

core/src/main/java/hudson/lifecycle/SystemdLifecycle.java

@@ -6,6 +6,7 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.kohsuke.accmod.Restricted;
@@ -46,6 +47,12 @@ public void onStop(@NonNull String user, @CheckForNull String remoteAddr) {
         notify("STOPPING=1");
     }
 
+    @Override
+    public void onExtendTimeout(long timeout, @NonNull TimeUnit unit) {
+        super.onExtendTimeout(timeout, unit);
+        notify(String.format("EXTEND_TIMEOUT_USEC=%d", unit.toMicros(timeout)));
+    }
+
     @Override
     public void onStatusUpdate(String status) {
         super.onStatusUpdate(status);

core/src/main/java/jenkins/model/Jenkins.java

@@ -1181,6 +1181,7 @@ private boolean containsLinkageError(Throwable x) {
             @Override
             protected void onInitMilestoneAttained(InitMilestone milestone) {
                 initLevel = milestone;
+                getLifecycle().onExtendTimeout(EXTEND_TIMEOUT_SECONDS, TimeUnit.SECONDS);
                 if (milestone == PLUGINS_PREPARED) {
                     // set up Guice to enable injection as early as possible
                     // before this milestone, ExtensionList.ensureLoaded() won't actually try to locate instances
@@ -5519,6 +5520,12 @@ public boolean shouldShowStackTrace() {
     @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
     public static boolean AUTOMATIC_AGENT_LAUNCH = SystemProperties.getBoolean(Jenkins.class.getName() + ".automaticAgentLaunch", true);
 
+    /**
+     * The amount of time by which to extend the startup notification timeout as each initialization milestone is attained.
+     */
+    @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
+    public static /* not final */ int EXTEND_TIMEOUT_SECONDS = SystemProperties.getInteger(Jenkins.class.getName() + ".extendTimeoutSeconds", 15);
+
     private static final Logger LOGGER = Logger.getLogger(Jenkins.class.getName());
     private static final SecureRandom RANDOM = new SecureRandom();