Resolving keytool timeouts on CI

- 60 seconds instead of 10
- Printing output in error messages

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

Author: dmatej

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

@@ -95,7 +95,7 @@ protected void createKeyStore(File keyStore, RepositoryConfig config, String mas
             final String instanceCertDN = getInstanceCertDN(config);
             keyTool.generateKeyPair(INSTANCE_SECURE_ADMIN_ALIAS, instanceCertDN, "RSA", 3650);
         } catch (IOException e) {
-            throw new DomainException(_strMgr.getString("SomeProblemWithKeytool", keyStore), e);
+            throw new DomainException(_strMgr.getString("SomeProblemWithKeytool"), e);
         }
     }
 
@@ -109,7 +109,7 @@ protected final void copyCertificatesToTrustStore(File configRoot, DomainConfig
             keyTool.copyCertificate(CERTIFICATE_ALIAS, trustStore);
             keyTool.copyCertificate(INSTANCE_SECURE_ADMIN_ALIAS, trustStore);
         } catch (IOException e) {
-            throw new DomainException(_strMgr.getString("SomeProblemWithKeytool", keyStore), e);
+            throw new DomainException(_strMgr.getString("SomeProblemWithKeytool"), e);
         }
     }
 

nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/LocalStrings.properties

@@ -32,7 +32,7 @@ installRoot=install root
 cannotDeleteJmsProviderInstance=Error deleting mq broker instance
 masterPasswordFileNotRead=Error reading master password file {0}
 
-keyStorePasswordNotChanged=Error changing keystore password for store {0}
+keyStorePasswordNotChanged=Error changing keystore password for store {0}.
 
 s1asKeyPasswordNotChanged=Error changing password for default key with alias s1as for store {0}
 
@@ -71,4 +71,9 @@ runtimeStatusToStringStartCluster.startedToStopped=This should be impossible.  T
 runtimeStatusToStringStartCluster.error=The clustered instance, {0}, could not be started.  It was originally in this state: [{1}] and now it is in this state: [{2}].
 
 CertificateDN=Distinguished Name of the self-signed X.509 Server Certificate is:\n[{0}]
-SomeProblemWithKeytool= Domain creation process involves a step that creates primary key and\n self-signed server certificate. This step failed for the reason shown below.\n This could be because JDK provided keytool program could not be found (e.g.\n you are running with JRE) or for some other reason. No need to panic, as you\n can always use JDK-keytool program to do the needful. A temporary JKS-keystore\n will be created. You should replace it with proper keystore before using it for SSL.\n Refer to documentation for details. Actual error is:\n{0}
+SomeProblemWithKeytool= Domain creation process involves a step that creates primary key and\n self-signed server certificate.\
+ This step failed for the reason shown below.\n This could be because JDK provided keytool program could not be found\
+  (e.g.\n you are running with JRE) or for some other reason. No need to panic, as you\n can always use JDK-keytool program to do the needful.\
+  A temporary JKS-keystore\n will be created.\
+  You should replace it with proper keystore before using it for SSL.\n Refer to documentation for details.\
+  Actual error is:\n

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

@@ -60,11 +60,7 @@ public RepositoryException(String message, Throwable cause) {
     private String format(String msg, String causeMsg, Throwable cause) {
         if (cause != null) {
             if (msg == null) {
-                if (causeMsg != null) {
-                    msg = causeMsg;
-                } else {
-                    msg = cause.toString();
-                }
+                msg = causeMsg == null ? cause.toString() : causeMsg;
             } else if (causeMsg != null && !causeMsg.equals(msg)) {
                 msg += PREFIX + causeMsg + POSTFIX;
             } else {

nucleus/common/glassfish-jdk-extensions/src/main/java/org/glassfish/main/jdke/security/KeyTool.java

@@ -50,7 +50,7 @@
 public class KeyTool {
 
     private static final Logger LOG = System.getLogger(KeyTool.class.getName());
-    private static final long EXEC_TIMEOUT = 10;
+    private static final long EXEC_TIMEOUT = Integer.getInteger("org.glassfish.main.keytool.timeout", 60);
     private static final String KEYTOOL;
 
     static {
@@ -378,26 +378,30 @@ private static void execute(final File keyStore, final List<String> command, fin
             }
 
             if (!process.waitFor(EXEC_TIMEOUT, TimeUnit.SECONDS)) {
-                throw new IOException("KeyTool command timed out after " + EXEC_TIMEOUT + " seconds");
+                throw new IOException(
+                    "KeyTool command timed out after " + EXEC_TIMEOUT + " seconds. Output: " + getOutput(process));
             }
             final int exitCode = process.exitValue();
-            final ByteArrayOutputStream output = new ByteArrayOutputStream();
-            process.getInputStream().transferTo(output);
-            process.getErrorStream().transferTo(output);
-            LOG.log(DEBUG, () -> "Command output: " + output.toString(Charset.defaultCharset()));
+            final String output = getOutput(process);
+            LOG.log(DEBUG, () -> "Command output: " + output);
             if (exitCode != 0) {
-                throw new IOException("KeyTool command failed with exit code: " + exitCode + " and output:"
-                    + output.toString(Charset.defaultCharset()));
+                throw new IOException("KeyTool command failed with exit code: " + exitCode + " and output: " + output);
             }
-        } catch (IOException e) {
-            throw new IOException("Failed to initialize keystore " + keyStore, e);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             throw new IOException("Interrupted", e);
         }
     }
 
 
+    private static String getOutput(final Process process) throws IOException {
+        final ByteArrayOutputStream output = new ByteArrayOutputStream();
+        process.getInputStream().transferTo(output);
+        process.getErrorStream().transferTo(output);
+        return output.toString(Charset.defaultCharset());
+    }
+
+
     private static void writeStdIn(char[][] stdinLines, Writer stdin) throws IOException {
         for (char[] line : stdinLines) {
             writeLine(line, stdin);