Bug 1654629 - Raise certificate timeout from 10s to 30s (#358)

rhq-project · Dec 12, 2018 · 4c2bd6f · 4c2bd6f
1 parent 920e978
commit 4c2bd6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerControl.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerControl.java
@@ -238,7 +238,7 @@ public Cli disconnected(boolean disconnected) {
         /**
          * runs dummy CLI operation (:whoami) in order to detect, whether server (if configured to SSL)
          * requires user to accept server's certificate. When running this command, jboss-cli can hang
-         * and wait for user input. For this reason, there is 10s timeout for this process to finish (hopefully 
+         * and wait for user input. For this reason, there is 30s timeout for this process to finish (hopefully
          * it is enough even in very slow environments)
          * @param
          * @return ProcessExecutionResults in case server <strong>requires</strong> accepting SSL certificate and subsequent 
@@ -249,7 +249,7 @@ private ProcessExecutionResults detectCertificateApprovalRequired() {
             String rhqPid = UUID.randomUUID().toString();
             ProcessExecutionResults result = ServerControl.onServer(pluginConfiguration, serverMode, systemInfo)
                 .killingOnTimeout(true)
-                .waitingFor(10 * 1000L)
+                .waitingFor(30 * 1000L)
                 .ignoreOutput()// avoid potential OOM https://bugzilla.redhat.com/show_bug.cgi?id=1238263
                 .cli()
                     .disconnected(false)

diff --git a/modules/plugins/wfly-10/src/main/java/org/rhq/modules/plugins/wildfly10/ServerControl.java b/modules/plugins/wfly-10/src/main/java/org/rhq/modules/plugins/wildfly10/ServerControl.java
@@ -239,7 +239,7 @@ public Cli disconnected(boolean disconnected) {
         /**
          * runs dummy CLI operation (:whoami) in order to detect, whether server (if configured to SSL)
          * requires user to accept server's certificate. When running this command, jboss-cli can hang
-         * and wait for user input. For this reason, there is 10s timeout for this process to finish (hopefully 
+         * and wait for user input. For this reason, there is 30s timeout for this process to finish (hopefully
          * it is enough even in very slow environments)
          * @param
          * @return ProcessExecutionResults in case server <strong>requires</strong> accepting SSL certificate and subsequent 
@@ -250,7 +250,7 @@ private ProcessExecutionResults detectCertificateApprovalRequired() {
             String rhqPid = UUID.randomUUID().toString();
             ProcessExecutionResults result = ServerControl.onServer(pluginConfiguration, serverMode, systemInfo)
                 .killingOnTimeout(true)
-                .waitingFor(10 * 1000L)
+                .waitingFor(30 * 1000L)
                 .ignoreOutput()// avoid potential OOM https://bugzilla.redhat.com/show_bug.cgi?id=1238263
                 .cli()
                     .disconnected(false)