Removed default timeout for start and stop domain

- By default we are sure what we are doing
- It is not easy to estimate how much time is needed.
- Can be explicitly set using --timeout argument

Signed-off-by: David Matějček <[email protected]>

Author: dmatej

nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIConstants.java

@@ -35,7 +35,7 @@ public final class CLIConstants {
     public static final String DEFAULT_HOSTNAME = "localhost";
     public static final String EOL = System.lineSeparator();
 
-    public static final Duration WAIT_FOR_DAS_TIME_MS = getEnv(TIMEOUT_START_SERVER, 60L);
+    public static final Duration WAIT_FOR_DAS_TIME_MS = getEnv(TIMEOUT_START_SERVER);
     public static final int RESTART_NORMAL = 10;
     public static final int RESTART_DEBUG_ON = 11;
     public static final int RESTART_DEBUG_OFF = 12;
@@ -44,7 +44,7 @@ public final class CLIConstants {
     public static final int SUCCESS = 0;
     public static final int ERROR = 1;
     public static final int WARNING = 4;
-    public static final Duration DEATH_TIMEOUT_MS = getEnv(TIMEOUT_STOP_SERVER, 60L);
+    public static final Duration DEATH_TIMEOUT_MS = getEnv(TIMEOUT_STOP_SERVER);
 
     public static final String K_ADMIN_PORT = "agent.adminPort";
     public static final String K_ADMIN_HOST = "agent.adminHost";
@@ -74,11 +74,11 @@ private CLIConstants() {
         // no instances allowed!
     }
 
-    private static Duration getEnv(GlassFishVariable variable, long defaultValue) {
+    private static Duration getEnv(GlassFishVariable variable) {
         String name = variable.getEnvName();
         String value = System.getenv(name);
         if (value == null) {
-            return Duration.ofSeconds(defaultValue);
+            return null;
         }
         try {
             int parsedValue = Integer.parseInt(value);
@@ -87,11 +87,11 @@ private static Duration getEnv(GlassFishVariable variable, long defaultValue) {
             }
             System.getLogger(CLIConstants.class.getName()).log(Level.WARNING,
                 "The value of the environment property {0} must be positive.", name);
-            return Duration.ofSeconds(defaultValue);
+            return null;
         } catch (NumberFormatException e) {
             System.getLogger(CLIConstants.class.getName()).log(Level.WARNING,
                 "Environment property {0} is set to a value {1} which cannot be parsed to duration.", name, value);
-            return Duration.ofSeconds(defaultValue);
+            return null;
         }
     }
 }

nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/RestartDomainCommand.java

@@ -122,8 +122,11 @@ protected int dasNotRunning() throws CommandException {
             opts.add("--domaindir");
             opts.add(domainDirParam);
         }
-        opts.add("--timeout");
-        opts.add(Long.toString(getStartTimeout().toSeconds()));
+        final Duration startTimeout = getStartTimeout();
+        if (startTimeout != null) {
+            opts.add("--timeout");
+            opts.add(Long.toString(startTimeout.toSeconds()));
+        }
         if (getDomainName() != null) {
             opts.add(getDomainName());
         }
@@ -147,6 +150,16 @@ private Duration getRestartTimeout() {
         if (paramTimeout != null) {
             return paramTimeout;
         }
+        final Duration startTimeout = getStartTimeout();
+        if (startTimeout == null && DEATH_TIMEOUT_MS == null) {
+            return null;
+        }
+        if (startTimeout == null) {
+            return DEATH_TIMEOUT_MS.plusSeconds(5L);
+        }
+        if (DEATH_TIMEOUT_MS == null) {
+            return startTimeout.plusSeconds(5L);
+        }
         return WAIT_FOR_DAS_TIME_MS.plus(DEATH_TIMEOUT_MS).plusSeconds(5);
     }
 }

nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalStrings.properties

@@ -91,7 +91,6 @@ StopInstance.noInstanceNameAllowed=No instance name allowed with --host option.
 StopInstance.instanceNotRunning=CLI1306 Warning - server instance is not running.
 Instance.noSuchInstance=CLI1307 Warning - no server instance found with that name.
 StopInstance.waitForDeath=Waiting for the instance to stop
-StopInstance.instanceNotDead=Timed out ({0} seconds) waiting for the instance to stop.
 ## SynchronizeInstanceCommand
 Sync.noDASConfigured=CLI800 das.properties file is missing, expected to find it here: {0}
 Sync.alreadySynced=CLI801 Instance is already synchronized

nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/RestartLocalInstanceCommand.java

@@ -109,9 +109,11 @@ protected int instanceNotRunning() throws CommandException {
         if (instanceName != null) {
             opts.add(instanceName);
         }
-        opts.add("--timeout");
-        opts.add(Long.toString(getStartTimeout().toSeconds()));
-
+        final Duration startTimeout = getStartTimeout();
+        if (startTimeout != null) {
+            opts.add("--timeout");
+            opts.add(Long.toString(startTimeout.toSeconds()));
+        }
         return cmd.execute(opts.toArray(String[]::new));
     }
 
@@ -131,6 +133,16 @@ private Duration getRestartTimeout() {
         if (paramTimeout != null) {
             return paramTimeout;
         }
+        final Duration startTimeout = getStartTimeout();
+        if (startTimeout == null && DEATH_TIMEOUT_MS == null) {
+            return null;
+        }
+        if (startTimeout == null) {
+            return DEATH_TIMEOUT_MS.plusSeconds(5L);
+        }
+        if (DEATH_TIMEOUT_MS == null) {
+            return startTimeout.plusSeconds(5L);
+        }
         return WAIT_FOR_DAS_TIME_MS.plus(DEATH_TIMEOUT_MS).plusSeconds(5);
     }
 }

nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/StopLocalInstanceCommand.java

@@ -24,6 +24,7 @@
 
 import java.io.File;
 import java.net.ConnectException;
+import java.text.MessageFormat;
 import java.time.Duration;
 import java.util.logging.Level;
 
@@ -182,7 +183,8 @@ protected void doCommand() throws CommandException {
             }
             final boolean dead = pid == null || ProcessUtils.waitWhileIsAlive(pid, getStopTimeout(), printDots);
             if (!dead) {
-                throw new CommandException(Strings.get("StopInstance.instanceNotDead", getStopTimeout().toSeconds()));
+                throw new CommandException(MessageFormat
+                    .format("Timed out {0} seconds waiting for the instance to stop.", getStopTimeout().toSeconds()));
             }
         } catch (Exception e) {
             // The server may have died so fast we didn't have time to

nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessUtils.java

@@ -225,7 +225,7 @@ public static void kill(File pidFile, Duration timeout, boolean printDots)
         // This is because File.exists() can cache file attributes
         if (!waitWhileIsAlive(pid, timeout, printDots)) {
             throw new KillTimeoutException(MessageFormat.format(
-                "The process {0} was killed, but it is still alive after timeout {1} s.", pid, timeout.getSeconds()));
+                "The process {0} was killed, but it is still alive after timeout {1} s.", pid, timeout.toSeconds()));
         }
     }