Attachment 832687 Details for Bug 1037855 – patch to remove async avail from plugins

[patch] patch to remove async avail from plugins

bz1037855.patch (text/plain), 19.74 KB, created by John Mazzitelli on 2013-12-04 14:43:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Mazzitelli

Created: 2013-12-04 14:43:47 UTC

Size: 19.74 KB

patch

obsolete

>diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityCollectorRunnable.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityCollectorRunnable.java
>index 5ce5bd7..47ce421 100644
>--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityCollectorRunnable.java
>+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityCollectorRunnable.java
>@@ -50,8 +50,10 @@ import org.rhq.core.util.exception.ThrowableUtil;
>  * by the asynchronous task - this retrieval of the last known availability will be very fast.
>  *
>  * @since 1.3
>+ * @deprecated this is no longer necessary in 4.10+ since the plugin container makes all avail checks asynchronous now
>  * @author John Mazzitelli
>  */
>+@Deprecated()
> public class AvailabilityCollectorRunnable implements Runnable {
>     private static final Log log = LogFactory.getLog(AvailabilityCollectorRunnable.class);
> 
>diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java
>index fb8bd27..67ae62d 100644
>--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java
>+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java
>@@ -72,8 +72,6 @@ import org.rhq.core.domain.measurement.MeasurementDataNumeric;
> import org.rhq.core.domain.measurement.MeasurementDataTrait;
> import org.rhq.core.domain.measurement.MeasurementReport;
> import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
>-import org.rhq.core.pluginapi.availability.AvailabilityCollectorRunnable;
>-import org.rhq.core.pluginapi.availability.AvailabilityFacet;
> import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
> import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
> import org.rhq.core.pluginapi.content.ContentContext;
>@@ -135,17 +133,7 @@ public class ApplicationServerComponent<T extends ResourceComponent<?>> implemen
>     private LogFileEventResourceComponentHelper logFileEventDelegate;
>     private CreateChildResourceFacetDelegate createChildResourceDelegate;
> 
>-    private AvailabilityCollectorRunnable availCollector;
>-
>     public AvailabilityType getAvailability() {
>-        if (this.availCollector != null) {
>-            return this.availCollector.getLastKnownAvailability();
>-        } else {
>-            return getAvailabilityNow();
>-        }
>-    }
>-
>-    private AvailabilityType getAvailabilityNow() {
>         connectToProfileService();
>         AvailabilityType availability;
>         if (this.connection != null) {
>@@ -200,35 +188,10 @@ public class ApplicationServerComponent<T extends ResourceComponent<?>> implemen
> 
>         this.createChildResourceDelegate = new CreateChildResourceFacetDelegate(this, this.getResourceContext());
> 
>-        // prepare to perform async avail checking
>-        Configuration pc = resourceContext.getPluginConfiguration();
>-        String availCheckPeriodProp = pc.getSimpleValue(
>-            ApplicationServerPluginConfigurationProperties.AVAIL_CHECK_PERIOD_CONFIG_PROP, null);
>-        if (availCheckPeriodProp != null) {
>-            try {
>-                long availCheckMillis = Integer.parseInt(availCheckPeriodProp) * 1000L;
>-                this.availCollector = resourceContext.getAvailabilityContext().createAvailabilityCollectorRunnable(
>-                    new AvailabilityFacet() {
>-                        public AvailabilityType getAvailability() {
>-                            return getAvailabilityNow();
>-                        }
>-                    }, availCheckMillis);
>-                this.availCollector.start();
>-            } catch (NumberFormatException nfe) {
>-                log.error("avail check period config prop was not a valid number. Cause: " + nfe);
>-                this.availCollector = null;
>-            }
>-        }
>-
>         return;
>     }
> 
>     public void stop() {
>-        if (this.availCollector != null) {
>-            this.availCollector.stop();
>-            this.availCollector = null;
>-        }
>-
>         this.logFileEventDelegate.stopLogFileEventPollers();
>         disconnectFromProfileService();
>         this.jmxConnectionHelper.closeConnection();
>diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java
>index c770844..7c30135 100644
>--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java
>+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java
>@@ -45,7 +45,6 @@ public class ApplicationServerPluginConfigurationProperties {
>     public static final String SHUTDOWN_MBEAN_OPERATION_CONFIG_PROP = "shutdownMBeanOperation";
>     public static final String SHUTDOWN_METHOD_CONFIG_PROP = "shutdownMethod";
>     public static final String SCRIPT_PREFIX_CONFIG_PROP = "scriptPrefix";
>-    public static final String AVAIL_CHECK_PERIOD_CONFIG_PROP = "availabilityCheckPeriod";
> 
>     private ApplicationServerPluginConfigurationProperties() {
>     }
>diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
>index e213719..306aed6 100644
>--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
>+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
>@@ -1029,13 +1029,6 @@
>           description="Name of the operation to invoke when shutting down this server through JMX.
>                                  Note that only operations with no parameter or with one int parameter are supported. If the
>                                  operation requires an int parameter, '0' will be supplied." />
>-        <c:simple-property name="availabilityCheckPeriod"
>-          description="The amount of time, in seconds, that must elapse between availability checks to see if the server is up. If set, the availability checks will be performed asynchronously thus allowing slow-responding servers to avoid being falsely reported as down."
>-          units="seconds" required="false" type="integer">
>-          <c:constraint>
>-            <c:integer-constraint minimum="60" />
>-          </c:constraint>
>-        </c:simple-property>
> 
>         <c:simple-property name="serviceAvailabilityRefreshInterval" units="minutes" required="false"
>           default="15" type="integer"
>diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
>index ac92616..5c02170 100644
>--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
>+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
>@@ -19,8 +19,6 @@
> 
> package org.rhq.modules.plugins.jbossas7;
> 
>-import static org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration.Property.AVAIL_CHECK_PERIOD_CONFIG_PROP;
>-
> import java.util.Collections;
> import java.util.Date;
> import java.util.HashSet;
>@@ -33,8 +31,6 @@ import org.rhq.core.domain.measurement.AvailabilityType;
> import org.rhq.core.domain.measurement.MeasurementDataTrait;
> import org.rhq.core.domain.measurement.MeasurementReport;
> import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
>-import org.rhq.core.pluginapi.availability.AvailabilityCollectorRunnable;
>-import org.rhq.core.pluginapi.availability.AvailabilityFacet;
> import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
> import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
> import org.rhq.core.pluginapi.inventory.ResourceContext;
>@@ -56,7 +52,6 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?>
>     private static final String MANAGED_SERVER_TYPE_NAME = "Managed Server";
> 
>     private LogFileEventResourceComponentHelper logFileEventDelegate;
>-    private AvailabilityCollectorRunnable availabilityCollector;
> 
>     @Override
>     public void start(ResourceContext<HostControllerComponent<?>> hostControllerComponentResourceContext)
>@@ -66,33 +61,12 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?>
>         logFileEventDelegate = new LogFileEventResourceComponentHelper(context);
>         logFileEventDelegate.startLogFileEventPollers();
> 
>-        Integer availabilityCheckPeriod = null;
>-        try {
>-            availabilityCheckPeriod = pluginConfiguration.getSimple(AVAIL_CHECK_PERIOD_CONFIG_PROP).getIntegerValue();
>-        } catch (NumberFormatException e) {
>-            log.error("Avail check period config prop was not a valid number. Cause: " + e);
>-        }
>-        if (availabilityCheckPeriod != null) {
>-            long availCheckMillis = availabilityCheckPeriod * 1000L;
>-            this.availabilityCollector = hostControllerComponentResourceContext.getAvailabilityContext()
>-                .createAvailabilityCollectorRunnable(new AvailabilityFacet() {
>-                    public AvailabilityType getAvailability() {
>-                        return getAvailabilityNow();
>-                    }
>-                }, availCheckMillis);
>-            this.availabilityCollector.start();
>-        }
>-
>     }
> 
>     @Override
>     public void stop() {
>         super.stop();
>         logFileEventDelegate.stopLogFileEventPollers();
>-        if (this.availabilityCollector != null) {
>-            this.availabilityCollector.stop();
>-            this.availabilityCollector = null;
>-        }
>     }
> 
>     /**
>@@ -103,14 +77,6 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?>
>      */
>     @Override
>     public AvailabilityType getAvailability() {
>-        if (this.availabilityCollector != null) {
>-            return this.availabilityCollector.getLastKnownAvailability();
>-        } else {
>-            return getAvailabilityNow();
>-        }
>-    }
>-
>-    private AvailabilityType getAvailabilityNow() {
>         if (context.getResourceType().getName().equals(MANAGED_SERVER_TYPE_NAME)) {
>             Address theAddress = new Address();
>             String host = pluginConfiguration.getSimpleValue("domainHost", "local");
>diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java
>index 3832ed2..4695e61 100644
>--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java
>+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java
>@@ -22,7 +22,6 @@ package org.rhq.modules.plugins.jbossas7.helper;
> import java.io.File;
> 
> import org.rhq.core.domain.configuration.Configuration;
>-import org.rhq.core.domain.configuration.PropertySimple;
> import org.rhq.modules.plugins.jbossas7.JBossProductType;
> 
> /**
>@@ -45,7 +44,6 @@ public class ServerPluginConfiguration {
>         public static final String LOG_DIR = "logDir";
>         public static final String PRODUCT_TYPE = "productType";
>         public static final String HOST_CONFIG_FILE = "hostConfigFile";
>-        public static final String AVAIL_CHECK_PERIOD_CONFIG_PROP = "availabilityCheckPeriod";
>     }
> 
>     private Configuration pluginConfig;
>@@ -146,14 +144,4 @@ public class ServerPluginConfiguration {
>                 hostConfigFile.toString() : null);
>     }
> 
>-    public Integer getAvailabilityCheckPeriod() {
>-        PropertySimple propertySimple = this.pluginConfig.getSimple(Property.AVAIL_CHECK_PERIOD_CONFIG_PROP);
>-        return propertySimple == null ? null : propertySimple.getIntegerValue();
>-    }
>-
>-    public void setAvailabilityCheckPeriod(Integer availabilityCheckPeriod) {
>-        this.pluginConfig.setSimpleValue(Property.AVAIL_CHECK_PERIOD_CONFIG_PROP,
>-                availabilityCheckPeriod == null ? null : availabilityCheckPeriod.toString());
>-    }
>-
> }
>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
>index 4e0bf38..9ef8789 100644
>--- 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
>@@ -102,16 +102,6 @@
>     </c:group>
> '>
> 
>-    <!ENTITY availabilityCheckPeriod '
>-        <c:simple-property name="availabilityCheckPeriod"
>-                           description="The amount of time, in seconds, that must elapse between availability checks to see if the server is up. If set, the availability checks will be performed asynchronously thus allowing slow-responding servers to avoid being falsely reported as down. Minimum value is 60 seconds."
>-                           units="seconds" required="false" type="integer">
>-          <c:constraint>
>-            <c:integer-constraint minimum="60"/>
>-          </c:constraint>
>-        </c:simple-property>
>-'>
>-
>     <!ENTITY serverKindMetrics '
>         <metric property="_skm:release-codename" dataType="trait"  displayName="Server Code Name"/>
>         <metric property="_skm:release-version" dataType="trait"  displayName="Server Version"/>
>@@ -952,9 +942,6 @@
>       &startScriptPluginConfigGroup;
>       &logSources;
> 
>-      <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
>-        &availabilityCheckPeriod;
>-      </c:group>
>     </plugin-configuration>
> 
>     <process-scan name="HostController" query="process|basename|match=^java.*,arg|org.jboss.as.host-controller|match=.*"/>
>@@ -1272,9 +1259,6 @@
>       &startScriptPluginConfigGroup;
>       &logSources;
> 
>-      <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
>-        &availabilityCheckPeriod;
>-      </c:group>
>     </plugin-configuration>
> 
>     <process-scan name="StandaloneAS" query="process|basename|match=^java.*,arg|org.jboss.as.standalone|match=.*"/>
>@@ -1723,9 +1707,6 @@
>     <plugin-configuration>
>       <c:simple-property name="path" readOnly="true"/>
>       &logSources;
>-      <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
>-        &availabilityCheckPeriod;
>-      </c:group>
>     </plugin-configuration>
> 
>     <operation name="start" description="Start this server instance." displayName="Start">
>diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
>index 4e092af..873caaa 100644
>--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
>+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
>@@ -80,8 +80,6 @@ import org.rhq.core.domain.measurement.MeasurementDataTrait;
> import org.rhq.core.domain.measurement.MeasurementReport;
> import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
> import org.rhq.core.domain.resource.CreateResourceStatus;
>-import org.rhq.core.pluginapi.availability.AvailabilityCollectorRunnable;
>-import org.rhq.core.pluginapi.availability.AvailabilityFacet;
> import org.rhq.core.pluginapi.content.ContentContext;
> import org.rhq.core.pluginapi.content.ContentFacet;
> import org.rhq.core.pluginapi.content.ContentServices;
>@@ -141,7 +139,6 @@ public class JBossASServerComponent<T extends ResourceComponent<?>> implements M
>     public static final String SHUTDOWN_MBEAN_OPERATION_CONFIG_PROP = "shutdownMbeanOperation";
>     public static final String SHUTDOWN_METHOD_CONFIG_PROP = "shutdownMethod";
>     public static final String JAVA_HOME_PATH_CONFIG_PROP = "javaHomePath";
>-    public static final String AVAIL_CHECK_PERIOD_CONFIG_PROP = "availabilityCheckPeriod";
> 
>     public static final String BINDING_ADDRESS_CONFIG_PROP = "bindingAddress";
> 
>@@ -204,8 +201,6 @@ public class JBossASServerComponent<T extends ResourceComponent<?>> implements M
> 
>     private MainDeployer mainDeployer;
> 
>-    private AvailabilityCollectorRunnable availCollector;
>-
>     private boolean loggedHijackedJnpUrlError;
> 
>     // ResourceComponent Implementation  --------------------------------------------
>@@ -263,33 +258,10 @@ public class JBossASServerComponent<T extends ResourceComponent<?>> implements M
>         this.logFileEventDelegate = new LogFileEventResourceComponentHelper(this.resourceContext);
>         this.logFileEventDelegate.startLogFileEventPollers();
> 
>-        // prepare to perform async avail checking
>-        String availCheckPeriodProp = pluginConfig.getSimpleValue(AVAIL_CHECK_PERIOD_CONFIG_PROP, null);
>-        if (availCheckPeriodProp != null) {
>-            try {
>-                long availCheckMillis = Integer.parseInt(availCheckPeriodProp) * 1000L;
>-                this.availCollector = resourceContext.getAvailabilityContext().createAvailabilityCollectorRunnable(
>-                    new AvailabilityFacet() {
>-                        public AvailabilityType getAvailability() {
>-                            return getAvailabilityNow();
>-                        }
>-                    }, availCheckMillis);
>-                this.availCollector.start();
>-            } catch (NumberFormatException nfe) {
>-                log.error("avail check period config prop was not a valid number. Cause: " + nfe);
>-                this.availCollector = null;
>-            }
>-        }
>-
>         return;
>     }
> 
>     public void stop() {
>-        if (this.availCollector != null) {
>-            this.availCollector.stop();
>-            this.availCollector = null;
>-        }
>-
>         this.logFileEventDelegate.stopLogFileEventPollers();
>         if (this.connection != null) {
>             try {
>@@ -304,14 +276,6 @@ public class JBossASServerComponent<T extends ResourceComponent<?>> implements M
>     }
> 
>     public AvailabilityType getAvailability() {
>-        if (this.availCollector != null) {
>-            return this.availCollector.getLastKnownAvailability();
>-        } else {
>-            return getAvailabilityNow();
>-        }
>-    }
>-
>-    private AvailabilityType getAvailabilityNow() {
>         try {
>             File serverHomeViaJnp = getServerHome();
>             if (this.configPath.getCanonicalPath().equals(serverHomeViaJnp.getCanonicalPath())) {
>diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
>index 36bc9fb..90776d1 100644
>--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
>+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
>@@ -158,12 +158,6 @@
>                                description="Name of the operation to invoke when shutting down this server through JMX.
>                                  Note that only operations with no parameter or with one int parameter are supported. If the
>                                  operation requires an int parameter, '0' will be supplied."/>
>-            <c:simple-property name="availabilityCheckPeriod" description="The amount of time, in seconds, that must elapse between availability checks to see if the server is up. If set, the availability checks will be performed asynchronously thus allowing slow-responding servers to avoid being falsely reported as down."
>-                               units="seconds" required="false" type="integer">
>-                <c:constraint>
>-                   <c:integer-constraint minimum="60"/>
>-                </c:constraint>
>-            </c:simple-property>
> 
>             <c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
>                                readOnly="true" required="false"

Actions: View | Diff

Attachments on bug 1037855: 832687 | 832706