[BZ 1381640] Add server connection settings to manage deploymentTimeouts

rhq-project · Apr 26, 2017 · f5435e7 · f5435e7
1 parent 447170c
commit f5435e7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/...lugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/...lugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
@@ -61,6 +61,7 @@
 import org.rhq.core.util.file.ContentFileInfo;
 import org.rhq.core.util.file.JarContentFileInfo;
 import org.rhq.modules.plugins.jbossas7.helper.Deployer;
+import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration;
 import org.rhq.modules.plugins.jbossas7.json.Address;
 import org.rhq.modules.plugins.jbossas7.json.Operation;
 import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
@@ -190,14 +191,12 @@ public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> package
 
         ASUploadConnection uploadConnection = null;
 
-        Configuration deploymentTimeConfiguration = detail.getDeploymentTimeConfiguration();
-        if(deploymentTimeConfiguration != null) {
-            PropertySimple userProvidedTimeoutMillis =
-                    deploymentTimeConfiguration.getSimple("userProvidedTimeoutMillis");
-            if (userProvidedTimeoutMillis != null && userProvidedTimeoutMillis.getIntegerValue() != null) {
-                Integer timeout = userProvidedTimeoutMillis.getIntegerValue();
+        ServerPluginConfiguration serverPluginConfiguration = getServerComponent().getServerPluginConfiguration();
+        if(serverPluginConfiguration != null && serverPluginConfiguration.getDeploymentConnectionTimeout() != null) {
+            Long timeout = serverPluginConfiguration.getDeploymentConnectionTimeout();
+            if(timeout != null) {
                 uploadConnection = new ASUploadConnection(getServerComponent().getASConnection(), detail
-                        .getKey().getName(), timeout);
+                        .getKey().getName(), timeout.intValue());
             }
         }
 

diff --git a/...as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java b/...as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java
@@ -47,6 +47,7 @@ public abstract class Property {
         public static final String USER = "user";
         public static final String PASSWORD = "password";
         public static final String MANAGEMENT_CONNECTION_TIMEOUT = "managementConnectionTimeout";
+        public static final String DEPLOYMENT_CONNECTION_TIMEOUT = "deploymentConnectionTimeout";
         public static final String HOME_DIR = "homeDir";
         public static final String BASE_DIR = "baseDir";
         public static final String CONFIG_DIR = "configDir";
@@ -168,6 +169,13 @@ public void setPassword(String password) {
         this.pluginConfig.setSimpleValue(Property.PASSWORD, password);
     }
 
+    public Long getDeploymentConnectionTimeout() {
+        if(pluginConfig.getSimple(Property.DEPLOYMENT_CONNECTION_TIMEOUT) != null) {
+            return pluginConfig.getSimple(Property.DEPLOYMENT_CONNECTION_TIMEOUT).getLongValue();
+        }
+        return null;
+    }
+
     public Long getManagementConnectionTimeout() {
         return this.pluginConfig.getSimple(Property.MANAGEMENT_CONNECTION_TIMEOUT).getLongValue();
     }

diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -1116,6 +1116,7 @@
       <c:simple-property name="user" type="string" description="Management user for a secured Host controller" required="false"/>
       <c:simple-property name="password" type="password" description="Password for the management user" required="false"/>
       <c:simple-property name="managementConnectionTimeout" type="long" description="Maximum time in milliseconds to keep alive an idle management connection. Zero and negative values will disable connection persistence. Defaults to 5000 ms." required="false" default="5000"/>
+      <c:simple-property name="deploymentConnectionTimeout" type="long" description="Maximum time in milliseconds to deploy new content. Defaults to 600000 ms." required="false" default="600000"/>
       <c:simple-property name="homeDir" type="file" description="Root directory of the server installation" displayName="Home Directory" readOnly="true" required="false"/>
       <c:simple-property name="baseDir" type="file" description="Base directory for server content" displayName="Base Directory" readOnly="true" required="false"/>
       <c:simple-property name="configDir" type="file" description="Base configuration directory" displayName="Configuration Directory" readOnly="true" required="false"/>
@@ -1503,6 +1504,7 @@
       <c:simple-property name="user" type="string" description="Management user for a secured AS" required="false"/>
       <c:simple-property name="password" type="password" description="Password for the management user" required="false"/>
       <c:simple-property name="managementConnectionTimeout" type="long" description="Maximum time in milliseconds to keep alive an idle management connection. Zero and negative values will disable connection persistence. Defaults to 5000 ms." required="false" default="5000"/>
+      <c:simple-property name="deploymentConnectionTimeout" type="long" description="Maximum time in milliseconds to deploy new content. Defaults to 600000 ms." required="false" default="600000"/>
       <c:simple-property name="homeDir" type="file" description="Root directory of the server installation" displayName="Home Directory" readOnly="true" required="false"/>
       <c:simple-property name="baseDir" type="file" description="Base directory for server content" displayName="Base Directory" readOnly="true" required="false"/>
       <c:simple-property name="configDir" type="file" description="Base configuration directory" displayName="Configuration Directory" readOnly="true" required="false"/>