26 Jan '13
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java | 113 ++++
modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java | 233 ++++++++++
modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java | 4
modules/core/client-api/src/test/resources/metadata-manager-test-2.xml | 3
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java | 48 ++
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java | 42 +
modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java | 37 +
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java | 7
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java | 10
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java | 6
modules/enterprise/agent/src/main/resources/agent-configuration.xml | 18
modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 1
12 files changed, 503 insertions(+), 19 deletions(-)
New commits:
commit 13cb988bb4835289393c8e3f736918651d6e2bae
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 25 23:02:09 2013 -0500
provide an agent configuration setting to disable resource types on the agent
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java
index 5ed8a38..01f8297 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java
@@ -22,6 +22,7 @@
*/
package org.rhq.core.clientapi.agent.metadata;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -73,6 +74,11 @@ public class PluginMetadataManager {
private Map<String, PluginDescriptor> descriptorsByPlugin = new HashMap<String, PluginDescriptor>();
+ private List<String> disabledResourceTypesAsStrings = null;
+ private Map<ResourceType, String> disabledResourceTypes = null;
+ private String disabledDiscoveryComponentClassName = null;
+ private String disabledResourceComponentClassName = null;
+
public PluginMetadataManager() {
}
@@ -138,11 +144,17 @@ public class PluginMetadataManager {
}
public String getDiscoveryClass(ResourceType resourceType) {
+ if (isDisabledResourceType(resourceType)) {
+ return this.disabledDiscoveryComponentClassName;
+ }
PluginMetadataParser parser = this.parsersByPlugin.get(resourceType.getPlugin());
return (parser != null) ? parser.getDiscoveryComponentClass(resourceType) : null;
}
public String getComponentClass(ResourceType resourceType) {
+ if (isDisabledResourceType(resourceType)) {
+ return this.disabledResourceComponentClassName;
+ }
PluginMetadataParser parser = this.parsersByPlugin.get(resourceType.getPlugin());
return (parser != null) ? parser.getComponentClass(resourceType) : null;
}
@@ -165,6 +177,7 @@ public class PluginMetadataManager {
for (ResourceType oldType : oldParser.getAllTypes()) {
this.typesByCategory.get(oldType.getCategory()).remove(oldType);
this.types.remove(oldType);
+ this.disabledResourceTypes.remove(oldType);
}
}
}
@@ -182,7 +195,11 @@ public class PluginMetadataManager {
}
}
- return parser.getRootResourceTypes();
+ findDisabledResourceTypesInAllPlugins();
+
+ Set<ResourceType> rootTypes = parser.getRootResourceTypes();
+ return rootTypes;
+
} catch (InvalidPluginDescriptorException e) {
// TODO Should we throw back or log partial failures or store them against the definitions?
log.error("Error transforming plugin descriptor [" + pluginDescriptor.getName() + "].", e);
@@ -191,19 +208,6 @@ public class PluginMetadataManager {
return null;
}
- // TODO Is this really appropriate? It's inconvenient to look up including the parent but
- // that is currently the accurate limiter... need to consider type keys
- // Otherwise we could use the business key which is the "plugin" name and the type name.
- public ResourceType getType(String typeName, ResourceCategory category) {
- for (ResourceType type : getTypesForCategory(category)) {
- if (type.getName().equals(typeName)) {
- return type;
- }
- }
-
- return null;
- }
-
/**
* Returns the Resource type with the specified name and plugin, or null if no such Resource type exists.
*
@@ -360,4 +364,85 @@ public class PluginMetadataManager {
}
return false;
}
+
+ /**
+ * This will define resource types that will be disabled - and by that it means
+ * the discovery and resource components will not do anything (it is assumed
+ * the classnames for the component classes will not do anything).
+ *
+ * Owners of this metadata manager need to set this during initialization prior to
+ * loading any plugins.
+ *
+ * @param disabledTypesAsStrings list of types, in the form "pluginName>parentType>childType"
+ * @param disabledDiscoveryComponentClassName the name of the discovery component class of all disable types
+ * @param disabledResourceComponentClassName the name of the resource component class of all disable types
+ */
+ public void setDisabledResourceTypes(List<String> disabledTypesAsStrings,
+ String disabledDiscoveryComponentClassName, String disabledResourceComponentClassName) {
+
+ if (disabledTypesAsStrings != null && !disabledTypesAsStrings.isEmpty()) {
+ this.disabledDiscoveryComponentClassName = disabledDiscoveryComponentClassName;
+ this.disabledResourceComponentClassName = disabledResourceComponentClassName;
+ this.disabledResourceTypesAsStrings = new ArrayList<String>(disabledTypesAsStrings);
+ log.info("Will disable the following resource types: " + this.disabledResourceTypesAsStrings);
+ } else {
+ this.disabledDiscoveryComponentClassName = null;
+ this.disabledResourceComponentClassName = null;
+ this.disabledResourceTypesAsStrings = null;
+ }
+ return;
+ }
+
+ private boolean isDisabledResourceType(ResourceType resourceType) {
+ if (this.disabledResourceTypes == null) {
+ return false;
+ }
+ return this.disabledResourceTypes.containsKey(resourceType);
+ }
+
+ // finds if type or its children are disabled and if so adds them to the map with their string representation
+ private void findDisabledResourceTypes(String parentHierarchy, ResourceType type,
+ HashMap<ResourceType, String> disabledTypes) {
+ // this is the current level we are at in the type hierarchy, as written in string form ("plugin>type>type...")
+ String typeHierarchy = parentHierarchy + '>' + type.getName();
+
+ // see if the given type is to be disabled - if so, add it to the map
+ if (this.disabledResourceTypesAsStrings.contains(typeHierarchy)) {
+ log.debug("Disabling resource type: " + type);
+ disabledTypes.put(type, typeHierarchy);
+ }
+
+ // recursively call ourselves to see if any child types are to be disabled
+ Set<ResourceType> childTypes = type.getChildResourceTypes();
+ if (childTypes != null) {
+ for (ResourceType childType : childTypes) {
+ findDisabledResourceTypes(typeHierarchy, childType, disabledTypes);
+ }
+ }
+
+ return;
+ }
+
+ private void findDisabledResourceTypesInAllPlugins() {
+ if (this.disabledResourceTypesAsStrings != null) {
+ int totalToBeDisabled = this.disabledResourceTypesAsStrings.size();
+ // we have to do it all over again over all plugins because we need to support the injection extension model
+ // that is, <runs-inside> - new plugins coming online might have injected types in previously loaded plugins
+ HashMap<ResourceType, String> disabledTypes = new HashMap<ResourceType, String>();
+ for (Map.Entry<String, PluginMetadataParser> entry : parsersByPlugin.entrySet()) {
+ PluginMetadataParser parser = entry.getValue();
+ PluginDescriptor pluginDescriptor = parser.getDescriptor();
+ Set<ResourceType> rootTypes = parser.getRootResourceTypes();
+ String hierarchyStart = pluginDescriptor.getName();
+ for (ResourceType rootType : rootTypes) {
+ findDisabledResourceTypes(hierarchyStart, rootType, disabledTypes);
+ }
+ if (disabledTypes.size() == totalToBeDisabled) {
+ break; // we found them all, no need to look at any more plugins
+ }
+ }
+ this.disabledResourceTypes = (!disabledTypes.isEmpty()) ? disabledTypes : null;
+ }
+ return;
+ }
}
diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java
new file mode 100644
index 0000000..d95f099
--- /dev/null
+++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java
@@ -0,0 +1,233 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.clientapi.agent.metadata.test;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.util.ValidationEventCollector;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager;
+import org.rhq.core.clientapi.descriptor.DescriptorPackages;
+import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
+
+/**
+ * Tests disabling resource types.
+ *
+ * @author John Mazzitelli
+ */
+public class MetadataManagerDisabledTypesTest {
+ private static final String DESCRIPTOR_FILENAME_TEST1 = "metadata-manager-test-1.xml";
+ private static final String DESCRIPTOR_FILENAME_TEST2 = "metadata-manager-test-2.xml";
+ private static final String DESCRIPTOR_FILENAME_TEST3 = "metadata-manager-test-3.xml";
+
+ private PluginMetadataManager metadataManager;
+ private final String disabledDiscoveryClazz = "org.rhq.test.DisabledDiscoveryClazzName";
+ private final String disabledComponentClazz = "org.rhq.test.DisabledResourceClazzName";
+
+ @BeforeClass
+ public void beforeClass() {
+ try {
+ this.metadataManager = new PluginMetadataManager();
+
+ List<String> disabledTypes = new ArrayList<String>();
+ disabledTypes.add("Test1>Server A>Service B"); // from DESCRIPTOR_FILENAME_TEST1
+ disabledTypes.add("Test1>Server A>Service D>Dependent Service E"); // from DESCRIPTOR_FILENAME_TEST1
+ disabledTypes.add("Test2>Extension Service C"); // from DESCRIPTOR_FILENAME_TEST2
+ disabledTypes.add("Test2>Extension Server B>Service D"); // from DESCRIPTOR_FILENAME_TEST2
+ disabledTypes.add("Test1>Server A>Injection D To Server A"); // from DESCRIPTOR_FILENAME_TEST3
+ disabledTypes.add("Test2>Extension Server B>Injection C To Server A"); // from DESCRIPTOR_FILENAME_TEST3
+ this.metadataManager
+ .setDisabledResourceTypes(disabledTypes, disabledDiscoveryClazz, disabledComponentClazz);
+
+ } catch (Throwable t) {
+ // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them
+ // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)!
+ t.printStackTrace();
+ throw new RuntimeException(t);
+ }
+ }
+
+ @Test
+ public void loadPluginDescriptorTest1() throws Exception {
+ PluginDescriptor pluginDescriptor;
+
+ URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME_TEST1);
+ System.out.println("Loading plugin descriptor at: " + descriptorUrl);
+
+ JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN);
+
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ ValidationEventCollector vec = new ValidationEventCollector();
+ unmarshaller.setEventHandler(vec);
+ pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream());
+
+ this.metadataManager.loadPlugin(pluginDescriptor);
+
+ System.out.println("\n~~~~~~~~~~~~DISABLE TYPES DESCRIPTOR TEST 1");
+ outputTypes();
+ }
+
+ @Test(dependsOnMethods = "loadPluginDescriptorTest1")
+ public void loadPluginDescriptorTest2() throws Exception {
+ PluginDescriptor pluginDescriptor;
+
+ URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME_TEST2);
+ System.out.println("Loading plugin descriptor at: " + descriptorUrl);
+
+ JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN);
+
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ ValidationEventCollector vec = new ValidationEventCollector();
+ unmarshaller.setEventHandler(vec);
+ pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream());
+
+ this.metadataManager.loadPlugin(pluginDescriptor);
+
+ System.out.println("\n~~~~~~~~~~~~DISABLE TYPES DESCRIPTOR TEST 2");
+ outputTypes();
+ }
+
+ @Test(dependsOnMethods = "loadPluginDescriptorTest2")
+ public void loadPluginDescriptorTest3() throws Exception {
+ PluginDescriptor pluginDescriptor;
+
+ URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME_TEST3);
+ System.out.println("Loading plugin descriptor at: " + descriptorUrl);
+
+ JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN);
+
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ ValidationEventCollector vec = new ValidationEventCollector();
+ unmarshaller.setEventHandler(vec);
+ pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream());
+
+ this.metadataManager.loadPlugin(pluginDescriptor);
+
+ System.out.println("\n~~~~~~~~~~~~DISABLE TYPES DESCRIPTOR TEST 3");
+ outputTypes();
+
+ // now see that we disabled the types
+
+ ResourceType serverA = getResourceType(new ResourceType("Server A", "Test1", ResourceCategory.SERVER, null));
+ assert serverA != null;
+ assertIsNOTDisabledType(serverA);
+
+ ResourceType serviceB = getResourceType(new ResourceType("Service B", "Test1", ResourceCategory.SERVICE, null));
+ assert serviceB != null;
+ assertIsDisabledType(serviceB);
+
+ ResourceType serviceD = getResourceType(new ResourceType("Service D", "Test1", ResourceCategory.SERVICE, null));
+ assert serviceD != null;
+ assertIsNOTDisabledType(serviceD);
+
+ ResourceType serviceE = getResourceType(new ResourceType("Dependent Service E", "Test1",
+ ResourceCategory.SERVICE, null));
+ assert serviceE != null;
+ assertIsDisabledType(serviceE);
+
+ ResourceType serviceC = getResourceType(new ResourceType("Extension Service C", "Test2",
+ ResourceCategory.SERVICE, null));
+ assert serviceC != null;
+ assertIsDisabledType(serviceC);
+
+ ResourceType extB = getResourceType(new ResourceType("Extension Server B", "Test2", ResourceCategory.SERVER,
+ null));
+ assert extB != null;
+ assertIsNOTDisabledType(extB);
+
+ ResourceType serviceD2 = getResourceType(new ResourceType("Service D", "Test2", ResourceCategory.SERVICE, null));
+ assert serviceD2 != null;
+ assertIsDisabledType(serviceD2);
+
+ ResourceType extDtoA = getResourceType(new ResourceType("Injection D To Server A", "Test3",
+ ResourceCategory.SERVICE, null));
+ assert extDtoA != null;
+ assertIsDisabledType(extDtoA);
+
+ // Note this type has a <runs-inside> to more than one parent. Even though it is injected into
+ // multiple parent hierarchies, if you specify it in only one hierarchy, it will be disabled in all
+ // other hierarchies it is injected into. This could be considered a feature or not :-)
+ // For example, in this test, we have disabled the type:
+ // Test2>Extension Server B>Injection C To Server A
+ // but if we specified to disable this type (the second parent it was injected into), the same thing would result:
+ // Test1>Server A>Injection C To Server A
+ // Finally, if we specified the type as it was directly declared in its plugin, again, the same thing would result,
+ // this type is disabled for all of the hierarchies it was injected into.
+ // Test3>Injection C To Server A
+ ResourceType extCtoA = getResourceType(new ResourceType("Injection C To Server A", "Test3",
+ ResourceCategory.SERVICE, null));
+ assert extCtoA != null;
+ assertIsDisabledType(extCtoA);
+ }
+
+ private void assertIsDisabledType(ResourceType type) {
+ assert metadataManager.getDiscoveryClass(type).equals(this.disabledDiscoveryClazz);
+ assert metadataManager.getComponentClass(type).equals(this.disabledComponentClazz);
+ }
+
+ private void assertIsNOTDisabledType(ResourceType type) {
+ assert !metadataManager.getDiscoveryClass(type).equals(this.disabledDiscoveryClazz);
+ assert !metadataManager.getComponentClass(type).equals(this.disabledComponentClazz);
+ }
+
+ private ResourceType getResourceType(ResourceType typeToGet) {
+ for (ResourceType type : metadataManager.getAllTypes()) {
+ if (type.equals(typeToGet)) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ private void outputTypes() {
+ Set<ResourceType> allTypes = metadataManager.getRootTypes();
+ for (ResourceType type : allTypes) {
+ outputType(type, 0);
+ }
+ System.out.flush();
+ }
+
+ private void outputType(ResourceType type, int depth) {
+ StringBuilder line = new StringBuilder();
+ for (int i = 0; i < depth; i++) {
+ line.append(" ");
+ }
+
+ line.append("+ ");
+ line.append(type.toString());
+ System.out.println(line.toString());
+ for (ResourceType child : type.getChildResourceTypes()) {
+ outputType(child, depth + 1);
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java
index 6abeff3..fbb6b1b 100644
--- a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java
+++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java
@@ -94,7 +94,7 @@ public class MetadataManagerTest {
@Test(dependsOnMethods = "loadPluginDescriptorTest1")
public void testDefinitionParsing1() {
- ResourceType serverAType = this.metadataManager.getType("Server A", ResourceCategory.SERVER);
+ ResourceType serverAType = this.metadataManager.getType("Server A", "Test1");
assert serverAType.getName().equals("Server A");
assert serverAType.getPlugin().equals("Test1");
assertServerTypeIsOK(serverAType);
@@ -122,7 +122,7 @@ public class MetadataManagerTest {
@Test(dependsOnMethods = "loadPluginDescriptorTest2")
public void testDefinitionParsing2() {
- ResourceType serverBType = this.metadataManager.getType("Extension Server B", ResourceCategory.SERVER);
+ ResourceType serverBType = this.metadataManager.getType("Extension Server B", "Test2");
assert serverBType.getName().equals("Extension Server B");
assert serverBType.getPlugin().equals("Test2");
assertServerTypeIsOK(serverBType);
diff --git a/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml b/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml
index 35bc20a..f19b2f4 100644
--- a/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml
+++ b/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml
@@ -6,9 +6,6 @@
<server name="Extension Server B" discovery="ServerBComponent" class="ServerBServerComponent"
description="Extension Server B Test Server"
sourcePlugin="Test1" sourceType="Server A">
- <service name="Service D" discovery="ServiceDComponent" class="ServiceDServerComponent"
- description="Extension Service D Test Service"
- sourcePlugin="Test1" sourceType="Service D"/>
</server>
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java
new file mode 100644
index 0000000..ddb9094
--- /dev/null
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java
@@ -0,0 +1,48 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.pluginapi.inventory;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+
+/**
+ * This is used when a resource type is disabled. It simply will do no work
+ * and {@link #getAvailability()} will never show UP.
+ *
+ * @author John Mazzitelli
+ */
+@SuppressWarnings("rawtypes")
+public class DisabledResourceComponent implements ResourceComponent {
+
+ @Override
+ public AvailabilityType getAvailability() {
+ return AvailabilityType.DOWN;
+ }
+
+ @Override
+ public void start(ResourceContext context) throws InvalidPluginConfigurationException, Exception {
+ }
+
+ @Override
+ public void stop() {
+ }
+}
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java
new file mode 100644
index 0000000..17ca66a
--- /dev/null
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java
@@ -0,0 +1,42 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.pluginapi.inventory;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * This is used when a resource type is disabled. When this discovery component is used for a type,
+ * it will simply not return any discovered resources.
+ *
+ * @author John Mazzitelli
+ */
+@SuppressWarnings("rawtypes")
+public class DisabledResourceDiscoveryComponent implements ResourceDiscoveryComponent {
+
+ @Override
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context)
+ throws InvalidPluginConfigurationException, Exception {
+ return Collections.emptySet();
+ }
+}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java
index e021d80..41dbda7 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java
@@ -47,6 +47,7 @@ public class PluginContainerConfiguration {
private static final String DATA_DIRECTORY_PROP = PROP_PREFIX + "data-directory";
private static final String TEMP_DIRECTORY_PROP = PROP_PREFIX + "temp-directory";
private static final String DISABLED_PLUGINS = PROP_PREFIX + "disabled-plugins";
+ private static final String DISABLED_RESOURCE_TYPES = PROP_PREFIX + "disabled-resource-types";
private static final String ROOT_PLUGIN_CLASSLOADER_REGEX_PROP = PROP_PREFIX + "root-plugin-classloader-regex";
private static final String CREATE_RESOURCE_CLASSLOADERS = PROP_PREFIX + "create-resource-classloaders";
private static final String START_MANAGEMENT_BEAN_PROP = PROP_PREFIX + "start-management-bean";
@@ -238,6 +239,42 @@ public class PluginContainerConfiguration {
}
/**
+ * If any resource types are to be disabled, the resource types names will be returned
+ * in a list.
+ * Each type is listed as "plugin name>parent type>child type".
+ * If no types are to be disabled an empty list is returned.
+ * The returned list is a copy, not the actual list used internally.
+ * Note that the plugin name is the name found in the plugin .xml descriptor in the plugin root element.
+ *
+ * @return list of resource type names identifying types to be disabled
+ */
+ @SuppressWarnings("unchecked")
+ public List<String> getDisabledResourceTypes() {
+ List<String> list = (List<String>) configuration.get(DISABLED_RESOURCE_TYPES);
+ if (list == null) {
+ return new ArrayList<String>(0);
+ } else {
+ return new ArrayList<String>(list);
+ }
+ }
+
+ /**
+ * If one or more resource types are not to be loaded by the plugin container, the given
+ * list should be the names of the types to be disabled.
+ * Each type is listed as "plugin name>parent type>child type".
+ * Note that the plugin name is the name found in the plugin .xml descriptor in the plugin root element.
+ *
+ * @param disabledResourceTypes
+ */
+ public void setDisabledResourceTypes(List<String> disabledResourceTypes) {
+ if (disabledResourceTypes != null) {
+ configuration.put(DISABLED_RESOURCE_TYPES, disabledResourceTypes);
+ } else {
+ configuration.remove(DISABLED_RESOURCE_TYPES);
+ }
+ }
+
+ /**
* Returns the regex that defines what classes the plugin container can provide to its
* plugins from its own classloader and its parents. If not <code>null</code>, any classes
* found in the plugin container's classloader (and its parent classloaders) that do
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java
index a5d12a2..17d1565 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java
@@ -45,6 +45,8 @@ import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
import org.rhq.core.domain.plugin.Plugin;
import org.rhq.core.pc.ContainerService;
import org.rhq.core.pc.PluginContainerConfiguration;
+import org.rhq.core.pluginapi.inventory.DisabledResourceComponent;
+import org.rhq.core.pluginapi.inventory.DisabledResourceDiscoveryComponent;
import org.rhq.core.pluginapi.plugin.PluginContext;
import org.rhq.core.pluginapi.plugin.PluginLifecycleListener;
import org.rhq.core.system.SystemInfo;
@@ -73,6 +75,8 @@ public class PluginManager implements ContainerService {
}
private static final Log log = LogFactory.getLog(PluginManager.class);
+ private static String DISABLED_DISCOVERY_COMPONENT_CLASS = DisabledResourceDiscoveryComponent.class.getName();
+ private static String DISABLED_RESOURCE_COMPONENT_CLASS = DisabledResourceComponent.class.getName();
/**
* The map of all plugins keyed on plugin name.
@@ -103,6 +107,9 @@ public class PluginManager implements ContainerService {
loadedPlugins = new ArrayList<Plugin>();
metadataManager = new PluginMetadataManager();
+ metadataManager.setDisabledResourceTypes(configuration.getDisabledResourceTypes(),
+ DISABLED_DISCOVERY_COMPONENT_CLASS, DISABLED_RESOURCE_COMPONENT_CLASS);
+
initUpdateLoadedPluginsCallback();
PluginFinder finder = configuration.getPluginFinder();
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java
index 6505648..939457a 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java
@@ -1217,6 +1217,15 @@ public class AgentConfiguration {
disabled_plugins = new ArrayList<String>(Arrays.asList(array));
}
+ // determine what, if any, resource types are to be disabled
+ String disabled_types_pref = m_preferences.get(AgentConfigurationConstants.PLUGINS_DISABLED_RESOURCE_TYPES,
+ null);
+ List<String> disabled_types = null;
+ if (disabled_types_pref != null) {
+ String[] array = disabled_types_pref.split("\\|");
+ disabled_types = new ArrayList<String>(Arrays.asList(array));
+ }
+
// Define what plugin container/agent classes are to be hidden from our plugins.
String clRegex = m_preferences.get(AgentConfigurationConstants.PLUGINS_ROOT_PLUGIN_CLASSLOADER_REGEX, null);
if (clRegex == null) {
@@ -1232,6 +1241,7 @@ public class AgentConfiguration {
config.setDataDirectory(data_directory);
config.setTemporaryDirectory(tmp_directory);
config.setDisabledPlugins(disabled_plugins);
+ config.setDisabledResourceTypes(disabled_types);
config.setRootPluginClassLoaderRegex(clRegex);
config.setServerDiscoveryInitialDelay(server_discovery_initial_delay);
config.setServerDiscoveryPeriod(server_discovery_period);
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java
index 5f0b8ed..4fe7df9 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java
@@ -549,6 +549,12 @@ public interface AgentConfigurationConstants {
String PLUGINS_DISABLED = PROPERTY_NAME_PREFIX + "plugins.disabled";
/**
+ * The |-separated list of names of resource types that are to be disabled at startup.
+ * Values are things like "plugin name>parent>child>grandchild|plugin name2>type".
+ */
+ String PLUGINS_DISABLED_RESOURCE_TYPES = PROPERTY_NAME_PREFIX + "plugins.disabled-resource-types";
+
+ /**
* Defines, in seconds, the initial delay before the first server discovery scan is run.
*/
String PLUGINS_SERVER_DISCOVERY_INITIAL_DELAY = PROPERTY_NAME_PREFIX
diff --git a/modules/enterprise/agent/src/main/resources/agent-configuration.xml b/modules/enterprise/agent/src/main/resources/agent-configuration.xml
index 8ef78c9..61339fe 100644
--- a/modules/enterprise/agent/src/main/resources/agent-configuration.xml
+++ b/modules/enterprise/agent/src/main/resources/agent-configuration.xml
@@ -838,6 +838,24 @@ commands named "config", "setconfig" and "setup" and the command line options
<!--
_______________________________________________________________
+ rhq.agent.plugins.disabled-resource-types
+
+ Defines the names of the resource types to be disabled.
+ This is a vertical-bar-separated list of type names, where a
+ type name is the plugin name (found in the name attribute
+ in the root XML element in the plugin descriptor) followed by
+ a series of ">" followed by type names (which follow the
+ type hierarchy defined in the plugin).
+
+ Example:
+ Platform>Network Adapter|JBossAS Server>Web Application (WAR)>Web Application Context
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.disabled-resource-types" value=""/>
+ -->
+
+ <!--
+ _______________________________________________________________
rhq.communications.configuration-schema-version
Defines what version of the agent configuration schema this
diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
index 01c0a41..a544775 100644
--- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
@@ -331,6 +331,7 @@
<c:simple-property name="rhq.agent.plugins.event-report.max-per-source" type="integer" activationPolicy="restart" required="false" default="200" displayName="Event Report Max Per Source" description="Defines the maximum number of events for any given event source that can be placed in a single event report that is sent up to the server. If this number is larger than the max-total setting, then this setting is ignored" />
<c:simple-property name="rhq.agent.plugins.event-report.max-total" type="integer" activationPolicy="restart" required="false" default="400" displayName="Event Report Max Total" description="Defines the total maximum number of events that can be placed in a single event report that is sent up to the server" />
<c:simple-property name="rhq.agent.plugins.disabled" type="string" activationPolicy="restart" required="false" default="" displayName="Disabled Plugins" description="Defines the plugins that should be disabled and not loaded by the plugin container. This is a comma-separated list of plugin names." />
+ <c:simple-property name="rhq.agent.plugins.disabled-resource-types" type="string" activationPolicy="restart" required="false" default="" displayName="Disabled Resource Types" description="Defines the resource types that should be disabled and not used by the plugin container. This is a |-separated list of type names in the form of 'plugin name>parent type>child type'." />
</c:group>
<c:group name="comm-endpoints" displayName="Communication Endpoints" hiddenByDefault="false">
<c:description>Communication settings that define the endpoints of this RHQ Agent and its RHQ Server</c:description>
1
0
[rhq] Branch 'feature/cassandra-backend' - modules/enterprise modules/plugins
by John Sanda 26 Jan '13
by John Sanda 26 Jan '13
26 Jan '13
modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp | 7 ++++---
modules/plugins/jboss-as-5/pom.xml | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit a299001c7b875cf4f8d1786ba4b0ee8675865fac
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Jan 25 18:25:19 2013 -0500
comment out OOB calculations from control.jsp for now to get build working
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
index 13bfd17..25d19c7 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
@@ -60,9 +60,10 @@
}
else if ("calculateOOBs".equals(mode))
{
- DataPurgeJob dpj = new DataPurgeJob();
- dpj.calculateOOBs();
- result = "Calculate OOBs done";
+ //DataPurgeJob dpj = new DataPurgeJob();
+ //dpj.calculateOOBs();
+ //result = "Calculate OOBs done";
+ result = "Cannot calculate OOBs currently";
}
else if ("checkForSuspectAgents".equals(mode))
{
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 9c71f33..43a30b7 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -484,9 +484,9 @@
also work and be faster but this way ensures we get the
correct bits.
-->
- <delete file="${as5.zipfile}"/>
+ <delete file="${as5.zipfile}" failonerror="false"/>
<delete dir="${java.io.tmpdir}/jboss-eap-${as5.version}" failonerror="false"/>
- <delete dir="${jboss5.home}"/>
+ <delete dir="${jboss5.home}" failonerror="false"/>
<get src="${as5.url}" dest="${as5.zipfile}"
usetimestamp="true" verbose="true"/>
1
0
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java | 22 ++++++++--
1 file changed, 19 insertions(+), 3 deletions(-)
New commits:
commit 3065c2613bc608fc82375d455f046c0e178eb6f2
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Jan 25 16:51:04 2013 -0500
disabling test for now since it is no longer applicable with cassandra backend
The test has essentially been replaced by MeasurementOOBManagerBeanTest.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
index e5190fb..1a0305d 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
@@ -313,10 +313,12 @@ public class MeasurementBaselineManagerTest extends AbstractEJB3Test {
}
/**
- * Calculate Out of Bound values. Those need to use baselines, so they are tested here
- * @throws Throwable If anything goes wrong.
+ * This test is disabled as the implementation of MeasurementOOBManagerBean is
+ * getting refactored. MeasurementOOBManagerBeanTest has been added to exercise the new
+ * implementation.
*/
@SuppressWarnings("unchecked")
+ @Test(enabled = false)
public void testCalculateOOB() throws Throwable {
begin();
@@ -343,6 +345,20 @@ public class MeasurementBaselineManagerTest extends AbstractEJB3Test {
insertMeasurementDataNumeric1H(young, measSched2, 2000.0, 1000.0, 3000.0);
insertMeasurementDataNumeric1H(youngest, measSched2, 1500.0, 500.0, 2500.0);
+ List<AggregatedNumericMetric> aggregates = asList(
+ new AggregatedNumericMetric(measSched.getId(), 0.0, 0.0, 0.0, 0),
+ new AggregatedNumericMetric(measSched.getId(), 30.0, 20.0, 40.0, eldest),
+ new AggregatedNumericMetric(measSched.getId(), 5.0, 2.0, 8.0, elder),
+ new AggregatedNumericMetric(measSched.getId(), 6.0, 3.0, 9.0, young),
+ new AggregatedNumericMetric(measSched.getId(), 40.0, 30.0, 50.0, youngest),
+
+ new AggregatedNumericMetric(measSched2.getId(), 40.0, 0.0, 0.0, 0),
+ new AggregatedNumericMetric(measSched2.getId(), 5000.0, 3500.0, 6500.0, eldest),
+ new AggregatedNumericMetric(measSched2.getId(), 5000.0, 3000.0, 7000.0, elder),
+ new AggregatedNumericMetric(measSched2.getId(), 2000.0, 1000.0, 3000.0, young),
+ new AggregatedNumericMetric(measSched2.getId(), 1500.0, 500.0, 2500.0, youngest)
+ );
+
commit();
long computeTime = baselineManager.calculateAutoBaselines(30000, System.currentTimeMillis());
@@ -350,7 +366,7 @@ public class MeasurementBaselineManagerTest extends AbstractEJB3Test {
begin();
// check the 2 values at 5000 against their bands computed between [500 and 1000]
- oobManager.computeOOBsFromHourBeginingAt(overlord, eldest);
+ oobManager.computeOOBsForLastHour(overlord, aggregates);
// check results
Query q = em.createQuery("SELECT oo FROM MeasurementOOB oo");
1
0
25 Jan '13
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementOOB.java | 15 ++
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBeanTest.java | 43 ------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java | 64 ++++++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerLocal.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java | 16 +-
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 7 -
8 files changed, 107 insertions(+), 50 deletions(-)
New commits:
commit 1b16477bed0e406687f0fdf06eff681af56c32eb
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Jan 25 15:17:30 2013 -0500
adding an initial impl for doing OOB calculations
This is an overly simple and very ineffcient implementation for doing OOB
calculations. The motivation is to just get tests passing before this undergoes
major refactoring.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementOOB.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementOOB.java
index 2aa212a..323280a 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementOOB.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementOOB.java
@@ -244,22 +244,33 @@ public class MeasurementOOB {
@Column(name = "OOB_FACTOR")
private int oobFactor;
- protected MeasurementOOB() {
-
+ public MeasurementOOB() {
}
public int getScheduleId() {
return id;
}
+ public void setScheduleId(int scheduleId) {
+ id = scheduleId;
+ }
+
public long getTimestamp() {
return timestamp;
}
+ public void setTimestamp(long timestamp) {
+ this.timestamp = timestamp;
+ }
+
public int getOobFactor() {
return oobFactor;
}
+ public void setOobFactor(int oobFactor) {
+ this.oobFactor = oobFactor;
+ }
+
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBeanTest.java
index b566ca7..1b20d43 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBeanTest.java
@@ -42,9 +42,6 @@ import javax.ejb.EJB;
import javax.inject.Inject;
import javax.persistence.EntityManager;
-import com.datastax.driver.core.Session;
-import com.datastax.driver.core.exceptions.NoHostAvailableException;
-
import org.joda.time.DateTime;
import org.testng.annotations.Test;
@@ -68,7 +65,6 @@ import org.rhq.enterprise.server.util.Overlord;
import org.rhq.enterprise.server.util.ResourceTreeHelper;
import org.rhq.server.metrics.AggregatedNumericMetric;
import org.rhq.server.metrics.MetricsDAO;
-import org.rhq.server.metrics.MetricsTable;
/**
* @author John Sanda
@@ -155,16 +151,13 @@ public class MeasurementOOBManagerBeanTest extends AbstractEJB3Test {
baseline(schedule3, 3.2, 3.6, 2.95)
));
- insert1HourData(asList(
- // schedule1 should be out of bounds on the lower bound
- new AggregateTestData(lastHour.getMillis(), schedule1.getId(), 3.8, 4.6, 2.11),
- // schedule2 should be out of bounds on the upper bound
- new AggregateTestData(lastHour.getMillis(), schedule2.getId(), 9.492, 9.53, 9.481),
- // schedule3 should be in bounds
- new AggregateTestData(lastHour.getMillis(), schedule3.getId(), 3.15, 3.59, 2.96)
- ));
+ List<AggregatedNumericMetric> metrics = asList(
+ new AggregatedNumericMetric(schedule1.getId(), 3.8, 2.11, 4.6, lastHour.getMillis()),
+ new AggregatedNumericMetric(schedule2.getId(), 9.492, 9.481, 9.53, lastHour.getMillis()),
+ new AggregatedNumericMetric(schedule3.getId(), 3.15, 2.96, 3.59, lastHour.getMillis())
+ );
- oobManager.computeOOBsFromLastHour(overlord);
+ oobManager.computeOOBsForLastHour(overlord, metrics);
executeInTransaction(new TransactionCallback() {
@Override
@@ -209,7 +202,6 @@ public class MeasurementOOBManagerBeanTest extends AbstractEJB3Test {
}
private void purgeDB() {
- purgeMetricsTables();
purgeBaselines();
purgeOOBs();
@@ -267,20 +259,6 @@ public class MeasurementOOBManagerBeanTest extends AbstractEJB3Test {
em.flush();
}
- private void purgeMetricsTables() {
- try {
- Session session = cassandraSessionManager.getSession();
-
- session.execute("TRUNCATE " + MetricsTable.RAW);
- session.execute("TRUNCATE " + MetricsTable.ONE_HOUR);
- session.execute("TRUNCATE " + MetricsTable.SIX_HOUR);
- session.execute("TRUNCATE " + MetricsTable.TWENTY_FOUR_HOUR);
- session.execute("TRUNCATE " + MetricsTable.INDEX);
- } catch (NoHostAvailableException e) {
- throw new RuntimeException("An error occurred while purging metrics tables", e);
- }
- }
-
public void purgeBaselines() {
purgeTables("rhq_measurement_bline");
}
@@ -323,15 +301,6 @@ public class MeasurementOOBManagerBeanTest extends AbstractEJB3Test {
}
}
- private void insert1HourData(List<AggregateTestData> data) {
- List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
- for (AggregateTestData datum : data) {
- metrics.add(new AggregatedNumericMetric(datum.getScheduleId(), datum.getAvg(), datum.getMin(),
- datum.getMax(), datum.getTimestamp()));
- }
- metricsDAO.insertAggregates(MetricsTable.ONE_HOUR, metrics, MetricsTable.ONE_HOUR.getTTL());
- }
-
private void insertBaselines(final List<MeasurementBaseline> baselines) {
executeInTransaction(false, new TransactionCallback() {
@Override
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
index cdfb7cc..2cd8ab3 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
@@ -22,6 +22,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -46,6 +47,7 @@ import org.rhq.core.db.OracleDatabaseType;
import org.rhq.core.db.PostgresqlDatabaseType;
import org.rhq.core.db.SQLServerDatabaseType;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.measurement.MeasurementBaseline;
import org.rhq.core.domain.measurement.MeasurementDataNumeric1H;
import org.rhq.core.domain.measurement.MeasurementDataPK;
import org.rhq.core.domain.measurement.MeasurementOOB;
@@ -59,6 +61,7 @@ import org.rhq.core.util.jdbc.JDBCUtil;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
import org.rhq.enterprise.server.util.QueryUtility;
+import org.rhq.server.metrics.AggregatedNumericMetric;
/**
* Manager bean for Out-of-Bound measurements.
@@ -188,6 +191,67 @@ public class MeasurementOOBManagerBean implements MeasurementOOBManagerLocal {
}
}
+ @SuppressWarnings("unchecked")
+ public void computeOOBsForLastHour(Subject subject, Collection<AggregatedNumericMetric> metrics) {
+ for (AggregatedNumericMetric metric : metrics) {
+ List<MeasurementBaseline> baselines = entityManager.createQuery(
+ "select baseline from MeasurementBaseline baseline where baseline.schedule.id = :scheduleId")
+ .setParameter("scheduleId", metric.getScheduleId())
+ .getResultList();
+ if (baselines.isEmpty()) {
+ continue;
+ }
+ MeasurementBaseline baseline = baselines.get(0);
+ Long upperDelta = null;
+ Long lowerDelta = null;
+
+ if (isPastUpperBound(baseline, metric)) {
+ upperDelta =
+ Math.round(((metric.getMax() - baseline.getMax()) / (baseline.getMax() - baseline.getMin())) * 100);
+ }
+
+ if (isPastLowerBound(baseline, metric)) {
+ lowerDelta =
+ Math.round(((baseline.getMin() - metric.getMin()) / (baseline.getMax() - baseline.getMin())) * 100);
+ }
+
+ Integer oobFactor;
+ if (upperDelta != null && lowerDelta == null) {
+ oobFactor = upperDelta.intValue();
+ } else if (upperDelta == null && lowerDelta != null) {
+ oobFactor = lowerDelta.intValue();
+ } else if (upperDelta != null && lowerDelta != null) {
+ if (upperDelta > lowerDelta) {
+ oobFactor = upperDelta.intValue();
+ } else {
+ oobFactor = lowerDelta.intValue();
+ }
+ } else { // both are null
+ oobFactor = null;
+ }
+
+ if (oobFactor != null) {
+ MeasurementOOB oob = new MeasurementOOB();
+ oob.setScheduleId(metric.getScheduleId());
+ oob.setTimestamp(metric.getTimestamp());
+ oob.setOobFactor(oobFactor);
+ entityManager.persist(oob);
+ }
+ }
+ }
+
+ private boolean isPastUpperBound(MeasurementBaseline baseline, AggregatedNumericMetric metric) {
+ return metric.getAvg() > baseline.getMax() &&
+ (baseline.getMax() - baseline.getMin() > 0.1) &&
+ (metric.getMax() - baseline.getMax() > 0);
+ }
+
+ private boolean isPastLowerBound(MeasurementBaseline baseline, AggregatedNumericMetric metric) {
+ return metric.getAvg() < baseline.getMax() &&
+ (baseline.getMax() - baseline.getMin() > 0.1) &&
+ (baseline.getMin() - metric.getMin()) > 0;
+ }
+
/**
* Computes the OOBs for the last hour.
* This is done by getting the latest timestamp of the 1h table and invoking
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerLocal.java
index e22a429..d4d3876 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerLocal.java
@@ -18,6 +18,8 @@
*/
package org.rhq.enterprise.server.measurement;
+import java.util.Collection;
+
import javax.ejb.Local;
import org.rhq.core.domain.auth.Subject;
@@ -25,6 +27,7 @@ import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
+import org.rhq.server.metrics.AggregatedNumericMetric;
/**
* Interface for the OOB Manager
@@ -44,6 +47,8 @@ public interface MeasurementOOBManagerLocal {
*/
void computeOOBsFromHourBeginingAt(Subject subject, long begin);
+ void computeOOBsForLastHour(Subject subject, Collection<AggregatedNumericMetric> metrics);
+
/**
* Return OOB Composites that contain all information about the OOBs in a given time as aggregates.
* @param subject The caller
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
index 98b4be6..1703284 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
@@ -58,9 +58,9 @@ public class MetricsManagerBean implements MetricsManagerLocal {
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
- public void calculateAggregates() {
+ public List<AggregatedNumericMetric> calculateAggregates() {
MetricsServer metricsServer = getMetricsServer();
- metricsServer.calculateAggregates();
+ return metricsServer.calculateAggregates();
}
@Override
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
index d6674eb..8ed4429 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
@@ -32,6 +32,7 @@ import javax.ejb.Local;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
+import org.rhq.server.metrics.AggregatedNumericMetric;
/**
* This SLSB is (hopefully) just a temporary wrapper over {@link org.rhq.server.metrics.MetricsServer MetricsServer}.
@@ -46,7 +47,7 @@ public interface MetricsManagerLocal {
void addNumericData(Set<MeasurementDataNumeric> data);
- void calculateAggregates();
+ List<AggregatedNumericMetric> calculateAggregates();
MeasurementDataNumeric findLatestValueForResource(int scheduleId);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java
index 2c5a74b..5121141 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java
@@ -19,7 +19,9 @@
package org.rhq.enterprise.server.scheduler.jobs;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
+import java.util.List;
import java.util.Properties;
import org.apache.commons.logging.Log;
@@ -48,6 +50,7 @@ import org.rhq.enterprise.server.scheduler.SchedulerLocal;
import org.rhq.enterprise.server.system.SystemManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
import org.rhq.enterprise.server.util.TimingVoodoo;
+import org.rhq.server.metrics.AggregatedNumericMetric;
/**
* This implements {@link StatefulJob} (as opposed to {@link Job}) because we do not need nor want this job triggered
@@ -86,12 +89,10 @@ public class DataPurgeJob extends AbstractStatefulJob {
try {
Properties systemConfig = LookupUtil.getSystemManager().getSystemConfiguration(
LookupUtil.getSubjectManager().getOverlord());
-// compressMeasurementData(LookupUtil.getMeasurementCompressionManager());
- compressMeasurementData(LookupUtil.getMetricsManager());
+ List<AggregatedNumericMetric> oneHourAggregates = compressMeasurementData(LookupUtil.getMetricsManager());
purgeEverything(systemConfig);
performDatabaseMaintenance(LookupUtil.getSystemManager(), systemConfig);
calculateAutoBaselines(LookupUtil.getMeasurementBaselineManager());
- calculateOOBs();
} catch (Exception e) {
LOG.error("Data Purge Job FAILED TO COMPLETE. Cause: " + e);
} finally {
@@ -100,14 +101,15 @@ public class DataPurgeJob extends AbstractStatefulJob {
}
}
- private void compressMeasurementData(MetricsManagerLocal metricsManager) {
+ private List<AggregatedNumericMetric> compressMeasurementData(MetricsManagerLocal metricsManager) {
long timeStart = System.currentTimeMillis();
LOG.info("Measurement data compression starting at " + new Date(timeStart));
try {
- metricsManager.calculateAggregates();
+ return metricsManager.calculateAggregates();
} catch (Exception e) {
LOG.error("Failed to compress measurement data. Cause: " + e, e);
+ return Collections.emptyList();
} finally {
long duration = System.currentTimeMillis() - timeStart;
LOG.info("Measurement data compression completed in [" + duration + "]ms");
@@ -357,7 +359,7 @@ public class DataPurgeJob extends AbstractStatefulJob {
* Calculate the OOB values for the last hour.
* This also removes outdated ones due to recalculated baselines.
*/
- public void calculateOOBs() {
+ public void calculateOOBs(List<AggregatedNumericMetric> oneHourAggregates) {
long timeStart = System.currentTimeMillis();
LOG.info("Auto-calculation of OOBs starting");
@@ -373,7 +375,7 @@ public class DataPurgeJob extends AbstractStatefulJob {
LookupUtil.getSystemManager().vacuum(overlord, new String[] { "RHQ_MEASUREMENT_OOB" });
// Now caclulate the fresh OOBs
- manager.computeOOBsFromLastHour(overlord);
+ manager.computeOOBsForLastHour(overlord, oneHourAggregates);
long duration = System.currentTimeMillis() - timeStart;
LOG.info("Auto-calculation of OOBs completed in [" + duration + "]ms");
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
index 86e49d0..bf7fe66 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
@@ -195,7 +195,7 @@ public class MetricsServer {
dao.updateMetricsIndex(MetricsTable.ONE_HOUR, updates);
}
- public void calculateAggregates() {
+ public List<AggregatedNumericMetric> calculateAggregates() {
// We first query the metrics index table to determine which schedules have data to
// be aggregated. Then we retrieve the metric data and aggregate or compress the
// data, writing the compressed values into the next wider (i.e., longer life span
@@ -212,7 +212,10 @@ public class MetricsServer {
// schedule id in that column has in fact been aggregated. It might be better for
// deleteMetricsIndexEntries to take a list of schedule ids to purge.
+ List<AggregatedNumericMetric> newOneHourAggregates = null;
+
List<AggregatedNumericMetric> updatedSchedules = aggregateRawData();
+ newOneHourAggregates = updatedSchedules;
if (!updatedSchedules.isEmpty()) {
dao.deleteMetricsIndexEntries(MetricsTable.ONE_HOUR);
updateMetricsIndex(MetricsTable.SIX_HOUR, updatedSchedules, Minutes.minutes(60 * 6));
@@ -229,6 +232,8 @@ public class MetricsServer {
if (!updatedSchedules.isEmpty()) {
dao.deleteMetricsIndexEntries(MetricsTable.TWENTY_FOUR_HOUR);
}
+
+ return newOneHourAggregates;
}
private void updateMetricsIndex(MetricsTable bucket, List<AggregatedNumericMetric> metrics, Minutes interval) {
1
0
25 Jan '13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 111 +++-----
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateMetricMapper.java | 134 ++++++----
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java | 75 +----
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsIndexResultSetMapper.java | 33 ++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/PagedResultSet.java | 118 ++++++++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Query.java | 4
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetricMapper.java | 106 +++++--
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ResultSetMapper.java | 37 ++
8 files changed, 408 insertions(+), 210 deletions(-)
New commits:
commit cfb0a69d4bb0ff29fc0917388f72fa8a37a8e239
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Jan 25 12:24:02 2013 -0600
Update REST metric handler bean to get results for streaming raw metrics from Cassandra.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index 8271f46..05b89e9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -22,10 +22,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.net.URI;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -83,13 +79,12 @@ import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowCo
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.ResourceGroup;
-import org.rhq.core.util.jdbc.JDBCUtil;
import org.rhq.enterprise.server.RHQConstants;
+import org.rhq.enterprise.server.cassandra.SessionManagerBean;
import org.rhq.enterprise.server.measurement.MeasurementAggregate;
import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal;
-import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
import org.rhq.enterprise.server.rest.domain.Baseline;
@@ -99,6 +94,9 @@ import org.rhq.enterprise.server.rest.domain.MetricAggregate;
import org.rhq.enterprise.server.rest.domain.MetricSchedule;
import org.rhq.enterprise.server.rest.domain.NumericDataPoint;
import org.rhq.enterprise.server.rest.domain.StringValue;
+import org.rhq.server.metrics.MetricsDAO;
+import org.rhq.server.metrics.PagedResultSet;
+import org.rhq.server.metrics.RawNumericMetric;
/**
* Deal with metrics
@@ -126,6 +124,10 @@ public class MetricHandlerBean extends AbstractRestBean {
ResourceManagerLocal resMgr;
@EJB
ResourceGroupManagerLocal groupMgr;
+
+ @EJB
+ private SessionManagerBean sessionManager;
+
@PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
EntityManager em;
@@ -636,7 +638,6 @@ public class MetricHandlerBean extends AbstractRestBean {
so.startTime = startTime;
so.endTime = endTime;
so.mediaType = mediaType;
- so.now = now-1; // pass this so that the for the 7days case is still handled from raw tables.
return so;
}
@@ -844,45 +845,20 @@ public class MetricHandlerBean extends AbstractRestBean {
int scheduleId;
long startTime;
long endTime;
- long now;
MediaType mediaType;
@Override
public void write(OutputStream outputStream) throws IOException, WebApplicationException {
+ MetricsDAO metricsDAO = new MetricsDAO(sessionManager.getSession());
+ PagedResultSet<RawNumericMetric> resultSet = metricsDAO.findRawMetricsPaged(scheduleId, startTime, endTime);
- String[] tables = MeasurementDataManagerUtility.getTables(startTime,endTime,now);
- StringBuilder sb = new StringBuilder();
- for (int i = 0 ; i < tables.length ; i ++) {
- sb.append("SELECT time_stamp,value FROM ");
- sb.append(tables[i]);
- sb.append(" WHERE schedule_id = ? AND time_stamp BETWEEN ? AND ?");
- if (i < tables.length-1)
- sb.append(" UNION ALL ");
- }
-
- sb.append(" ORDER BY time_stamp ASC");
-
+ PrintWriter pw = new PrintWriter(outputStream);
-
- Connection connection = null;
- PreparedStatement ps = null;
- ResultSet rs = null;
- try {
- connection = rhqDs.getConnection();
- ps = connection.prepareStatement( sb.toString() );
- for (int i = 0; i < tables.length ; i++) {
- ps.setInt(i * 3 + 1, scheduleId);
- ps.setLong(i*3+2,startTime);
- ps.setLong(i*3+3,endTime);
- }
- rs = ps.executeQuery();
-
- PrintWriter pw = new PrintWriter(outputStream);
-
- if (mediaType.equals(MediaType.APPLICATION_JSON_TYPE)) {
- boolean needsComma = false;
- pw.println("[");
- while (rs.next()) {
+ if (mediaType.equals(MediaType.APPLICATION_JSON_TYPE)) {
+ boolean needsComma = false;
+ pw.println("[");
+ while (!resultSet.isExhausted()) {
+ for (RawNumericMetric metric : resultSet.getNextPage()) {
if (needsComma) {
pw.print(",\n");
}
@@ -892,59 +868,58 @@ public class MetricHandlerBean extends AbstractRestBean {
pw.print(scheduleId);
pw.print(", ");
pw.print("\"timeStamp\":");
- pw.print(rs.getLong(1));
+ pw.print(metric.getTimestamp());
pw.print(", ");
pw.print("\"value\":");
- pw.print(rs.getDouble(2));
+ pw.print(metric.getValue());
pw.print("}");
}
- pw.println("]");
}
- else if (mediaType.equals(MediaType.APPLICATION_XML_TYPE)) {
- pw.println("<collection>");
- while(rs.next()) {
+ pw.println("]");
+ } else if (mediaType.equals(MediaType.APPLICATION_XML_TYPE)) {
+ pw.println("<collection>");
+ while (!resultSet.isExhausted()) {
+ for (RawNumericMetric metric : resultSet.getNextPage()) {
pw.print(" <numericDataPoint scheduleId=\"");
pw.print(scheduleId);
pw.print("\" timeStamp=\"");
- pw.print(rs.getLong(1));
+ pw.print(metric.getTimestamp());
pw.print("\" value=\"");
- pw.print(rs.getDouble(2));
+ pw.print(metric.getValue());
pw.println("\"/>");
}
- pw.println("</collection>");
}
- else if (mediaType.toString().equals("text/csv")) {
- pw.println("#schedule,timestamp,value");
- while (rs.next()) {
+ pw.println("</collection>");
+ } else if (mediaType.toString().equals("text/csv")) {
+ pw.println("#schedule,timestamp,value");
+ while (!resultSet.isExhausted()) {
+ for (RawNumericMetric metric : resultSet.getNextPage()) {
pw.print(scheduleId);
pw.print(',');
- pw.print(rs.getLong(1));
+ pw.print(metric.getTimestamp());
pw.print(',');
- pw.println(rs.getDouble(2));
+ pw.println(metric.getValue());
}
}
- else if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
- pw.println("<table>");
- pw.print("<tr><th>time</th><th>value</th></tr>\n");
- while (rs.next()) {
+ } else if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
+ pw.println("<table>");
+ pw.print("<tr><th>time</th><th>value</th></tr>\n");
+ while (!resultSet.isExhausted()) {
+ for (RawNumericMetric metric : resultSet.getNextPage()) {
pw.print(" <tr>");
pw.print("<td>");
- pw.print(new Date(rs.getLong(1)));
+ pw.print(new Date(metric.getTimestamp()));
pw.print("</td><td>");
- pw.print(rs.getDouble(2));
+ pw.print(metric.getValue());
pw.print("</td>");
pw.println("</tr>");
}
- pw.println("</table>");
-
}
- pw.flush();
- pw.close();
- } catch (SQLException e) {
- log.error(e);
- } finally {
- JDBCUtil.safeClose(connection, ps, rs);
+ pw.println("</table>");
+
}
+ pw.flush();
+ pw.close();
}
}
}
commit 78e5e519f0fb069fffc803465aa4f98cf06945a5
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Jan 25 12:23:21 2013 -0600
Add paged result sets mapped to domain objects to the metrics DAO interface. So far only raw metrics can be obtained via a paged set.
Also updated all the other usage of domain object mappers to the new model.
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateMetricMapper.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateMetricMapper.java
index 58642ed..ab66788 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateMetricMapper.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateMetricMapper.java
@@ -25,9 +25,10 @@
package org.rhq.server.metrics;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
/**
@@ -45,70 +46,113 @@ public class AggregateMetricMapper implements ResultSetMapper<AggregatedNumericM
if (includeMetadata) {
resultSetMapper = new ResultSetMapper<AggregatedNumericMetric>() {
@Override
- public AggregatedNumericMetric map(ResultSet resultSet) throws SQLException {
- return null;
+ public List<AggregatedNumericMetric> mapAll(ResultSet resultSet) {
+ List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
+ while (!resultSet.isExhausted()) {
+ metrics.add(mapOne(resultSet));
+ }
+
+ return metrics;
}
@Override
- public AggregatedNumericMetric map(Row... row) {
- AggregatedNumericMetric metric = new AggregatedNumericMetric();
- metric.setScheduleId(row[0].getInt(0));
- metric.setTimestamp(row[0].getDate(1).getTime());
- metric.setMax(row[0].getDouble(3));
- metric.setMin(row[1].getDouble(3));
- metric.setAvg(row[2].getDouble(3));
-
- ColumnMetadata maxMetadata = new ColumnMetadata(row[0].getInt(4), row[0].getLong(5));
- ColumnMetadata minMetadata = new ColumnMetadata(row[1].getInt(4), row[1].getLong(5));
- ColumnMetadata avgMetadata = new ColumnMetadata(row[2].getInt(4), row[2].getLong(5));
-
- metric.setAvgColumnMetadata(avgMetadata);
- metric.setMaxColumnMetadata(maxMetadata);
- metric.setMinColumnMetadata(minMetadata);
-
- return metric;
+ public AggregatedNumericMetric mapOne(ResultSet resultSet) {
+ return map(resultSet.fetchOne(), resultSet.fetchOne(), resultSet.fetchOne()).get(0);
+ }
+
+ @Override
+ public List<AggregatedNumericMetric> map(Row... row) {
+ List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
+
+ for (int i = 0; i < row.length; i += 3) {
+ AggregatedNumericMetric metric = new AggregatedNumericMetric();
+ metric.setScheduleId(row[i].getInt(0));
+ metric.setTimestamp(row[i].getDate(1).getTime());
+ metric.setMax(row[i].getDouble(3));
+ metric.setMin(row[i + 1].getDouble(3));
+ metric.setAvg(row[i + 2].getDouble(3));
+
+ ColumnMetadata maxMetadata = new ColumnMetadata(row[i].getInt(4), row[i].getLong(5));
+ ColumnMetadata minMetadata = new ColumnMetadata(row[i + 1].getInt(4), row[i + 1].getLong(5));
+ ColumnMetadata avgMetadata = new ColumnMetadata(row[i + 2].getInt(4), row[i + 2].getLong(5));
+
+ metric.setAvgColumnMetadata(avgMetadata);
+ metric.setMaxColumnMetadata(maxMetadata);
+ metric.setMinColumnMetadata(minMetadata);
+
+ metrics.add(metric);
+ }
+
+ return metrics;
+ }
+
+ @Override
+ public AggregatedNumericMetric map(Row row) {
+ throw new UnsupportedOperationException(
+ "Method is not supported. Only triples are accepted for mapping.");
}
};
} else {
resultSetMapper = new ResultSetMapper<AggregatedNumericMetric>() {
@Override
- public AggregatedNumericMetric map(ResultSet resultSet) throws SQLException {
- return null;
+ public List<AggregatedNumericMetric> mapAll(ResultSet resultSet) {
+ List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
+ while (!resultSet.isExhausted()) {
+ metrics.add(mapOne(resultSet));
+ }
+
+ return metrics;
}
@Override
- public AggregatedNumericMetric map(Row... row) {
- AggregatedNumericMetric metric = new AggregatedNumericMetric();
- metric.setScheduleId(row[0].getInt(0));
- metric.setTimestamp(row[0].getDate(1).getTime());
- metric.setMax(row[0].getDouble(3));
- metric.setMin(row[1].getDouble(3));
- metric.setAvg(row[2].getDouble(3));
-
- return metric;
+ public AggregatedNumericMetric mapOne(ResultSet resultSet) {
+ return map(resultSet.fetchOne(), resultSet.fetchOne(), resultSet.fetchOne()).get(0);
+ }
+
+ @Override
+ public List<AggregatedNumericMetric> map(Row... row) {
+ List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
+
+ for (int i = 0; i < row.length; i += 3) {
+ AggregatedNumericMetric metric = new AggregatedNumericMetric();
+ metric.setScheduleId(row[i].getInt(0));
+ metric.setTimestamp(row[i].getDate(1).getTime());
+ metric.setMax(row[i].getDouble(3));
+ metric.setMin(row[i + 1].getDouble(3));
+ metric.setAvg(row[i + 2].getDouble(3));
+
+ metrics.add(metric);
+ }
+
+ return metrics;
+ }
+
+ @Override
+ public AggregatedNumericMetric map(Row row) {
+ throw new UnsupportedOperationException(
+ "Method is not supported. Only triples are accepted for mapping.");
}
};
}
}
@Override
- public AggregatedNumericMetric map(ResultSet resultSet) throws SQLException {
- AggregatedNumericMetric metric = new AggregatedNumericMetric();
- metric.setScheduleId(resultSet.getInt(1));
- metric.setTimestamp(resultSet.getDate(2).getTime());
- metric.setMax(resultSet.getDouble(4));
-
- resultSet.next();
- metric.setMin(resultSet.getDouble(4));
-
- resultSet.next();
- metric.setAvg(resultSet.getDouble(4));
+ public List<AggregatedNumericMetric> mapAll(ResultSet resultSet) {
+ return resultSetMapper.mapAll(resultSet);
+ }
- return metric;
+ @Override
+ public AggregatedNumericMetric mapOne(ResultSet resultSet) {
+ return resultSetMapper.mapOne(resultSet);
}
@Override
- public AggregatedNumericMetric map(Row... rows) {
+ public List<AggregatedNumericMetric> map(Row... rows) {
return resultSetMapper.map(rows);
}
+
+ @Override
+ public AggregatedNumericMetric map(Row row) {
+ return resultSetMapper.map(row);
+ }
}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
index 7f940ef..e33db48 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
@@ -221,13 +221,22 @@ public class MetricsDAO {
BoundStatement boundStatement = statement.bind(scheduleId, new Date(startTime), new Date(endTime));
ResultSet resultSet = session.execute(boundStatement);
- List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
ResultSetMapper<RawNumericMetric> resultSetMapper = new RawNumericMetricMapper();
- for (Row row : resultSet) {
- metrics.add(resultSetMapper.map(row));
- }
+ return resultSetMapper.mapAll(resultSet);
+ } catch (NoHostAvailableException e) {
+ throw new CQLException(e);
+ }
+ }
- return metrics;
+ public PagedResultSet<RawNumericMetric> findRawMetricsPaged(int scheduleId, long startTime, long endTime) {
+ try {
+ PreparedStatement statement = session.prepare(RAW_METRICS_QUERY);
+ BoundStatement boundStatement = statement.bind(scheduleId, new Date(startTime), new Date(endTime));
+ ResultSet resultSet = session.execute(boundStatement);
+
+ PagedResultSet<RawNumericMetric> pagedResultSet = new PagedResultSet<RawNumericMetric>(resultSet,
+ new RawNumericMetricMapper());
+ return pagedResultSet;
} catch (NoHostAvailableException e) {
throw new CQLException(e);
}
@@ -243,12 +252,8 @@ public class MetricsDAO {
BoundStatement boundStatement = statement.bind(scheduleId);
ResultSet resultSet = session.execute(boundStatement);
- List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
ResultSetMapper<RawNumericMetric> resultSetMapper = new RawNumericMetricMapper();
- for (Row row : resultSet) {
- metrics.add(resultSetMapper.map(row));
- }
- return metrics;
+ return resultSetMapper.mapAll(resultSet);
} catch (NoHostAvailableException e) {
throw new CQLException(e);
}
@@ -266,12 +271,8 @@ public class MetricsDAO {
BoundStatement boundStatement = statement.bind(scheduleId, new Date(startTime), new Date(endTime));
ResultSet resultSet = session.execute(boundStatement);
- List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
ResultSetMapper<RawNumericMetric> resultSetMapper = new RawNumericMetricMapper(true);
- for (Row row : resultSet) {
- metrics.add(resultSetMapper.map(row));
- }
- return metrics;
+ return resultSetMapper.mapAll(resultSet);
} catch (NoHostAvailableException e) {
throw new CQLException(e);
}
@@ -288,18 +289,12 @@ public class MetricsDAO {
//PreparedStatement statement = session.prepare(RAW_METRICS_SCHEDULE_LIST_QUERY);
//BoundStatement boundStatement = statement.bind(scheduleIds, startTime, endTime);
//ResultSet resultSet = session.execute(boundStatement);
-
String cql = "SELECT schedule_id, time, value FROM " + MetricsTable.RAW + " WHERE schedule_id IN ("
+ listToString(scheduleIds) + ") AND time >= " + startTime + " AND time <= " + endTime;
ResultSet resultSet = session.execute(cql);
- List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
ResultSetMapper<RawNumericMetric> resultSetMapper = new RawNumericMetricMapper(false);
- for (Row row : resultSet) {
- metrics.add(resultSetMapper.map(row));
- }
-
- return metrics;
+ return resultSetMapper.mapAll(resultSet);
} catch (NoHostAvailableException e) {
throw new CQLException(e);
}
@@ -316,13 +311,8 @@ public class MetricsDAO {
BoundStatement boundStatement = statement.bind(scheduleId);
ResultSet resultSet = session.execute(boundStatement);
- List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
ResultSetMapper<AggregatedNumericMetric> resultSetMapper = new AggregateMetricMapper();
- while (!resultSet.isExhausted()) {
- metrics.add(resultSetMapper.map(resultSet.fetchOne(), resultSet.fetchOne(), resultSet.fetchOne()));
- }
-
- return metrics;
+ return resultSetMapper.mapAll(resultSet);
} catch (NoHostAvailableException e) {
throw new CQLException(e);
}
@@ -340,13 +330,8 @@ public class MetricsDAO {
BoundStatement boundStatement = statement.bind(scheduleId, new Date(startTime), new Date(endTime));
ResultSet resultSet = session.execute(boundStatement);
- List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
ResultSetMapper<AggregatedNumericMetric> resultSetMapper = new AggregateMetricMapper();
- while (!resultSet.isExhausted()) {
- metrics.add(resultSetMapper.map(resultSet.fetchOne(), resultSet.fetchOne(), resultSet.fetchOne()));
- }
-
- return metrics;
+ return resultSetMapper.mapAll(resultSet);
} catch (NoHostAvailableException e) {
throw new CQLException(e);
}
@@ -380,13 +365,8 @@ public class MetricsDAO {
"WHERE schedule_id IN (" + listToString(scheduleIds) + ") AND time >= " + startTime + " AND time < " + endTime;
ResultSet resultSet = session.execute(cql);
- List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
ResultSetMapper<AggregatedNumericMetric> resultSetMapper = new AggregateMetricMapper();
- while (!resultSet.isExhausted()) {
- metrics.add(resultSetMapper.map(resultSet.fetchOne(), resultSet.fetchOne(), resultSet.fetchOne()));
- }
-
- return metrics;
+ return resultSetMapper.mapAll(resultSet);
} catch (NoHostAvailableException e) {
throw new CQLException(e);
}
@@ -404,13 +384,8 @@ public class MetricsDAO {
BoundStatement boundStatement = statement.bind(scheduleId, new Date(startTime), new Date(endTime));
ResultSet resultSet = session.execute(boundStatement);
- List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
ResultSetMapper<AggregatedNumericMetric> resultSetMapper = new AggregateMetricMapper(true);
- while (!resultSet.isExhausted()) {
- metrics.add(resultSetMapper.map(resultSet.fetchOne(), resultSet.fetchOne(), resultSet.fetchOne()));
- }
-
- return metrics;
+ return resultSetMapper.mapAll(resultSet);
} catch (NoHostAvailableException e) {
throw new CQLException(e);
}
@@ -422,14 +397,8 @@ public class MetricsDAO {
BoundStatement boundStatement = statement.bind(table.toString());
ResultSet resultSet = session.execute(boundStatement);
- List<MetricsIndexEntry> indexEntries = new ArrayList<MetricsIndexEntry>();
ResultSetMapper<MetricsIndexEntry> resultSetMapper = new MetricsIndexResultSetMapper(table);
- for (Row row : resultSet) {
- indexEntries.add(resultSetMapper.map(row));
- }
-
- return indexEntries;
-
+ return resultSetMapper.mapAll(resultSet);
} catch (NoHostAvailableException e) {
throw new CQLException(e);
}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsIndexResultSetMapper.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsIndexResultSetMapper.java
index 3a0db3e..5c9a4c3 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsIndexResultSetMapper.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsIndexResultSetMapper.java
@@ -25,9 +25,10 @@
package org.rhq.server.metrics;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
@@ -43,12 +44,32 @@ public class MetricsIndexResultSetMapper implements ResultSetMapper<MetricsIndex
}
@Override
- public MetricsIndexEntry map(ResultSet resultSet) throws SQLException {
- return new MetricsIndexEntry(bucket, resultSet.getDate(1), resultSet.getInt(2));
+ public List<MetricsIndexEntry> mapAll(ResultSet resultSet) {
+ List<MetricsIndexEntry> result = new ArrayList<MetricsIndexEntry>();
+ for (Row singleRow : resultSet) {
+ result.add(map(singleRow));
+ }
+
+ return result;
+ }
+
+ @Override
+ public MetricsIndexEntry mapOne(ResultSet resultSet) {
+ return map(resultSet.fetchOne());
+ }
+
+ @Override
+ public List<MetricsIndexEntry> map(Row... row) {
+ List<MetricsIndexEntry> result = new ArrayList<MetricsIndexEntry>();
+ for (Row singleRow : row) {
+ result.add(new MetricsIndexEntry(bucket, singleRow.getDate(0), singleRow.getInt(1)));
+ }
+
+ return result;
}
@Override
- public MetricsIndexEntry map(Row... row) {
- return new MetricsIndexEntry(bucket, row[0].getDate(0), row[0].getInt(1));
+ public MetricsIndexEntry map(Row row) {
+ return new MetricsIndexEntry(bucket, row.getDate(0), row.getInt(1));
}
}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/PagedResultSet.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/PagedResultSet.java
new file mode 100644
index 0000000..be0145a
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/PagedResultSet.java
@@ -0,0 +1,118 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.server.metrics;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.datastax.driver.core.ResultSet;
+
+/**
+ *
+ * @author Stefan Negrea
+ *
+ */
+public class PagedResultSet<T> implements Iterable<List<T>> {
+
+ private static final int DEFAULT_PAGE_SIZE = 200;
+
+ private final ResultSetMapper<T> mapper;
+ private final ResultSet resultSet;
+
+ private int pageSize = DEFAULT_PAGE_SIZE;
+
+ /**
+ * @param resultSet result set to map
+ * @param mapper mapper
+ * @param pageSize page size
+ */
+ public PagedResultSet(ResultSet resultSet, ResultSetMapper<T> mapper, int pageSize) {
+ this(resultSet, mapper);
+ this.pageSize = pageSize;
+ }
+
+ /**
+ * @param resultSet result set to map
+ * @param mapper mapper
+ */
+ public PagedResultSet(ResultSet resultSet, ResultSetMapper<T> mapper) {
+ this.resultSet = resultSet;
+ this.mapper = mapper;
+ }
+
+ /**
+ * @return the page size
+ */
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ /**
+ * @param pageSize the page size to set
+ */
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public List<T> getNextPage() {
+ List<T> result = new ArrayList<T>();
+ for (int i = 0; i < this.getPageSize(); i++) {
+ if (!resultSet.isExhausted()) {
+ result.add((T) mapper.mapOne(resultSet));
+ } else {
+ break;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * @return true if the result is exhausted, false otherwise
+ */
+ public boolean isExhausted() {
+ return resultSet.isExhausted();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Iterable#iterator()
+ */
+ @Override
+ public Iterator<List<T>> iterator() {
+
+ return new Iterator<List<T>>() {
+
+ public boolean hasNext() {
+ return !isExhausted();
+ }
+
+ public List<T> next() {
+ return getNextPage();
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+
+}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Query.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Query.java
index 938feea..17ec498 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Query.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Query.java
@@ -54,8 +54,8 @@ public class Query<T> {
try {
resultSet = statement.executeQuery();
while (resultSet.next()) {
- T row = resultSetMapper.map(resultSet);
- callback.invoke(row);
+ //T row = resultSetMapper.map(resultSet);
+ //callback.invoke(row);
}
} catch(SQLException e) {
throw new CQLException(e);
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetricMapper.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetricMapper.java
index f697543..329a20e 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetricMapper.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetricMapper.java
@@ -25,9 +25,10 @@
package org.rhq.server.metrics;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
/**
@@ -43,60 +44,101 @@ public class RawNumericMetricMapper implements ResultSetMapper<RawNumericMetric>
public RawNumericMetricMapper(boolean metaDataIncluded) {
if (metaDataIncluded) {
-// mapper = new ResultSetMapper<RawNumericMetric>() {
-// @Override
-// public RawNumericMetric map(ResultSet resultSet) throws SQLException {
-// RawNumericMetric rawMetric = new RawNumericMetric(resultSet.getInt(1),
-// resultSet.getDate(2).getTime(), resultSet.getDouble(3));
-// ColumnMetadata metadata = new ColumnMetadata(resultSet.getInt(4), resultSet.getLong(5));
-// rawMetric.setColumnMetadata(metadata);
-// return rawMetric;
-// }
-// };
mapper = new ResultSetMapper<RawNumericMetric>() {
@Override
- public RawNumericMetric map(ResultSet resultSet) throws SQLException {
- return null;
+ public List<RawNumericMetric> mapAll(ResultSet resultSet) {
+ List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
+ for (Row row : resultSet) {
+ metrics.add(map(row));
+ }
+
+ return metrics;
+ }
+
+ @Override
+ public RawNumericMetric mapOne(ResultSet resultSet) {
+ return mapper.map(resultSet.fetchOne());
}
@Override
- public RawNumericMetric map(Row... row) {
- RawNumericMetric metric = new RawNumericMetric(row[0].getInt(0), row[0].getDate(1).getTime(),
- row[0].getDouble(2));
- ColumnMetadata metadata = new ColumnMetadata(row[0].getInt(3), row[0].getLong(4));
+ public List<RawNumericMetric> map(Row... row) {
+ List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
+
+ for (Row singleRow : row) {
+ RawNumericMetric metric = new RawNumericMetric(singleRow.getInt(0), singleRow.getDate(1)
+ .getTime(), singleRow.getDouble(2));
+ ColumnMetadata metadata = new ColumnMetadata(singleRow.getInt(3), singleRow.getLong(4));
+ metric.setColumnMetadata(metadata);
+
+ metrics.add(metric);
+ }
+
+ return metrics;
+ }
+
+ @Override
+ public RawNumericMetric map(Row row) {
+ RawNumericMetric metric = new RawNumericMetric(row.getInt(0), row.getDate(1).getTime(),
+ row.getDouble(2));
+ ColumnMetadata metadata = new ColumnMetadata(row.getInt(3), row.getLong(4));
metric.setColumnMetadata(metadata);
+
return metric;
}
};
} else {
-// mapper = new ResultSetMapper<RawNumericMetric>() {
-// @Override
-// public RawNumericMetric map(ResultSet resultSet) throws SQLException {
-// return new RawNumericMetric(resultSet.getInt(1), resultSet.getDate(2).getTime(),
-// resultSet.getDouble(3));
-// }
-// };
mapper = new ResultSetMapper<RawNumericMetric>() {
@Override
- public RawNumericMetric map(ResultSet resultSet) throws SQLException {
- return null;
+ public List<RawNumericMetric> mapAll(ResultSet resultSet) {
+ List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
+ for (Row row : resultSet) {
+ metrics.add(map(row));
+ }
+
+ return metrics;
+ }
+
+ @Override
+ public RawNumericMetric mapOne(ResultSet resultSet) {
+ return map(resultSet.fetchOne());
}
@Override
- public RawNumericMetric map(Row... row) {
- return new RawNumericMetric(row[0].getInt(0), row[0].getDate(1).getTime(), row[0].getDouble(2));
+ public List<RawNumericMetric> map(Row... row) {
+ List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
+ for (Row singleRow : row) {
+ metrics.add(new RawNumericMetric(singleRow.getInt(0), singleRow.getDate(1).getTime(), singleRow
+ .getDouble(2)));
+ }
+
+ return metrics;
+ }
+
+ @Override
+ public RawNumericMetric map(Row row) {
+ return new RawNumericMetric(row.getInt(0), row.getDate(1).getTime(), row.getDouble(2));
}
};
}
}
@Override
- public RawNumericMetric map(ResultSet resultSet) throws SQLException {
- return mapper.map(resultSet);
+ public List<RawNumericMetric> mapAll(ResultSet resultSet) {
+ return mapper.mapAll(resultSet);
+ }
+
+ @Override
+ public RawNumericMetric mapOne(ResultSet resultSet) {
+ return mapper.mapOne(resultSet);
+ }
+
+ @Override
+ public List<RawNumericMetric> map(Row... row) {
+ return mapper.map(row);
}
@Override
- public RawNumericMetric map(Row... row) {
+ public RawNumericMetric map(Row row) {
return mapper.map(row);
}
}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ResultSetMapper.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ResultSetMapper.java
index f62af8a..c1ea60e 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ResultSetMapper.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ResultSetMapper.java
@@ -25,9 +25,9 @@
package org.rhq.server.metrics;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.util.List;
+import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
/**
@@ -35,8 +35,37 @@ import com.datastax.driver.core.Row;
*/
public interface ResultSetMapper<T> {
- T map(ResultSet resultSet) throws SQLException;
+ /**
+ * Maps the entire result set to a list.
+ *
+ * @param resultSet result set to map
+ * @return a list of mapped rows
+ */
+ List<T> mapAll(ResultSet resultSet);
- T map(Row... row);
+ /**
+ * Return only one mapped domain object. One mapped object could
+ * require multiple rows from the result set.
+ *
+ * @param resultSet result set to map
+ * @return
+ */
+ T mapOne(ResultSet resultSet);
+ /**
+ * Map all the rows passed to domain objects. More than one row could
+ * be required for mapping a single object.
+ *
+ * @param row
+ * @return
+ */
+ List<T> map(Row... row);
+
+ /**
+ * Map a sigle row to a domain object.
+ *
+ * @param row
+ * @return
+ */
+ T map(Row row);
}
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java | 10 -
modules/enterprise/server/jar/intentional-api-changes-since-4.5.1.xml | 12 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 43 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java | 91 +++++++++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java | 90 +++++++++
5 files changed, 234 insertions(+), 12 deletions(-)
New commits:
commit 48e2ecc14bd7d70b6b02909c9ef0149c24eac2bd
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Jan 25 16:54:14 2013 +0100
[BZ [RFE] Schedule an operation using cron expression via JBoss ON CLI] Methods scheduleResourceOperationUsingCron() and scheduleGroupOperationUsingCron() have been added to the OperationManager.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java
index 3ce6064..c2cb5db 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java
@@ -24,8 +24,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.quartz.CronTrigger;
-
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.criteria.GroupOperationHistoryCriteria;
import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
@@ -111,14 +109,12 @@ public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements O
throw getExceptionToThrowToClient(t);
}
}
-
+
public void scheduleResourceOperation(int resourceId, String operationName, Configuration parameters,
String description, int timeout, String cronString) throws RuntimeException {
try {
- CronTrigger cronTrigger = new CronTrigger("resource " + resourceId + "_" + operationName, "group",
- cronString);
- ResourceOperationSchedule opSchedule = operationManager.scheduleResourceOperation(getSessionSubject(),
- resourceId, operationName, parameters, cronTrigger, description);
+ ResourceOperationSchedule opSchedule = operationManager.scheduleResourceOperationUsingCron(getSessionSubject(),
+ resourceId, operationName, cronString, timeout, parameters, description);
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.5.1.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.5.1.xml
index c7a95dd..245503e 100644
--- a/modules/enterprise/server/jar/intentional-api-changes-since-4.5.1.xml
+++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.5.1.xml
@@ -21,4 +21,16 @@
<justification>Removed already deprecated web services in this release, this file was used for WS client-server
compatibility</justification>
</difference>
+ <difference>
+ <className>org/rhq/enterprise/server/operation/OperationManagerRemote</className>
+ <differenceType>7012</differenceType> <!-- method added to an interface -->
+ <method>org.rhq.core.domain.operation.bean.ResourceOperationSchedule scheduleResourceOperationUsingCron(org.rhq.core.domain.auth.Subject, int, java.lang.String, java.lang.String, int, org.rhq.core.domain.configuration.Configuration, java.lang.String)</method>
+ <justification>Adding a method to a remote API interface is safe. This class is never to be implemented by users.</justification>
+ </difference>
+ <difference>
+ <className>org/rhq/enterprise/server/operation/OperationManagerRemote</className>
+ <differenceType>7012</differenceType> <!-- method added to an interface -->
+ <method>org.rhq.core.domain.operation.bean.GroupOperationSchedule scheduleGroupOperationUsingCron(org.rhq.core.domain.auth.Subject, int, int[], boolean, java.lang.String, org.rhq.core.domain.configuration.Configuration, java.lang.String, int, java.lang.String)</method>
+ <justification>Adding a method to a remote API interface is safe. This class is never to be implemented by users.</justification>
+ </difference>
</differences>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
index ef937c8..e7151fb 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
@@ -42,7 +42,6 @@ import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
-import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility;
import org.rhq.core.clientapi.agent.operation.CancelResults;
import org.rhq.core.clientapi.agent.operation.CancelResults.InterruptedState;
import org.rhq.core.domain.auth.Subject;
@@ -50,6 +49,7 @@ import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.common.JobTrigger;
import org.rhq.core.domain.common.composite.IntegerOptionItem;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.ConfigurationUtility;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.criteria.GroupOperationHistoryCriteria;
@@ -166,6 +166,25 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
}
}
+ public ResourceOperationSchedule scheduleResourceOperationUsingCron(Subject subject, int resourceId,
+ String operationName, String cronExpression, int timeout, Configuration parameters, String description)
+ throws ScheduleException {
+ // if the user set a timeout, add it to our configuration
+ if (timeout > 0L) {
+ if (parameters == null) {
+ parameters = new Configuration();
+ }
+ parameters.put(new PropertySimple(OperationDefinition.TIMEOUT_PARAM_NAME, timeout));
+ }
+ try {
+ CronTrigger cronTrigger = new CronTrigger("resource " + resourceId + "_" + operationName, "group",
+ cronExpression);
+ return scheduleResourceOperation(subject, resourceId, operationName, parameters, cronTrigger, description);
+ } catch (Exception e) {
+ throw new ScheduleException(e);
+ }
+ }
+
public int scheduleResourceOperation(Subject subject, ResourceOperationSchedule schedule) throws ScheduleException {
JobTrigger jobTrigger = schedule.getJobTrigger();
Trigger trigger = convertToTrigger(jobTrigger);
@@ -1944,7 +1963,6 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
if (null == parameters) {
parameters = new Configuration();
}
-
parameters.put(new PropertySimple(OperationDefinition.TIMEOUT_PARAM_NAME, timeout));
}
@@ -1955,6 +1973,27 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
}
}
+ public GroupOperationSchedule scheduleGroupOperationUsingCron(Subject subject, int groupId,
+ int[] executionOrderResourceIds, boolean haltOnFailure, String operationName, Configuration parameters,
+ String cronExpression, int timeout, String description) throws ScheduleException {
+
+ // if the user set a timeout, add it to our configuration
+ if (timeout > 0L) {
+ if (parameters == null) {
+ parameters = new Configuration();
+ }
+ parameters.put(new PropertySimple(OperationDefinition.TIMEOUT_PARAM_NAME, timeout));
+ }
+ CronTrigger cronTrigger = new CronTrigger();
+ try {
+ cronTrigger.setCronExpression(cronExpression);
+ return scheduleGroupOperation(subject, groupId, executionOrderResourceIds, haltOnFailure, operationName,
+ parameters, cronTrigger, description);
+ } catch (Exception e) {
+ throw new ScheduleException(e);
+ }
+ }
+
@SuppressWarnings("unchecked")
public List<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject,
OperationDefinitionCriteria criteria) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
index bf2d77c..bce2a18 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
@@ -72,6 +72,45 @@ public interface OperationManagerLocal {
* scheduled operation
*/
int scheduleResourceOperation(Subject subject, ResourceOperationSchedule schedule);
+
+
+ /**
+ * Schedules a Resource operation for execution using the cron expression.
+ *
+ * @param subject the user who is asking to schedule the job
+ * @param resourceId the resource that is the target of the operation
+ * @param operationName the actual operation to invoke
+ * @param cronExpression the cron expression specifying the repetition.
+ * For example:
+ * <pre>
+ * 0 0 12 * * ? Fire at 12pm (noon) every day
+ * 0 15 10 ? * * Fire at 10:15am every day
+ * 0 15 10 * * ? Fire at 10:15am every day
+ * 0 15 10 * * ? * Fire at 10:15am every day
+ * 0 15 10 * * ? 2005 Fire at 10:15am every day during the year 2005
+ * 0 * 14 * * ? every minute starting at 2pm and ending at 2:59pm, every day
+ * 0 0/5 14 * * ? every 5 minutes starting at 2pm and ending at 2:55pm, ev. d.
+ * 0 0-5 14 * * ? Fire every minute starting at 2pm and ending at 2:05pm, every day
+ * 0 10,44 14 ? 3 WED Fire at 2:10pm and at 2:44pm every Wednesday in the month of March.
+ * 0 15 10 ? * MON-FRI Fire at 10:15am every Monday, Tuesday, Wednesday, Thursday and Friday
+ * 0 15 10 15 * ? Fire at 10:15am on the 15th day of every month
+ * 0 15 10 L * ? Fire at 10:15am on the last day of every month
+ * 0 15 10 ? * 6L Fire at 10:15am on the last Friday of every month
+ * 0 15 10 ? * 6L Fire at 10:15am on the last Friday of every month
+ * 0 15 10 ? * 6L 2002-2005 at 10:15am on every last friday of every month during the years
+ * 0 15 10 ? * 6#3 Fire at 10:15am on the third Friday of every month
+ * 0 11 11 11 11 ? Fire every November 11th at 11:11am.
+ * </pre>
+ * @param timeout the number of seconds before this operation will fail due to timeout. 0 for no timeout.
+ * @param parameters the names parameters for the operation.
+ * @param description user-entered description of the job to be scheduled
+ *
+ * @return the information on the new schedule
+ *
+ * @throws SchedulerException if failed to schedule the operation
+ */
+ ResourceOperationSchedule scheduleResourceOperationUsingCron(Subject subject, int resourceId, String operationName,
+ String cronExpression, int timeout, Configuration parameters, String description) throws ScheduleException;
/**
* Schedules a Resource group operation for execution.
@@ -632,11 +671,59 @@ public interface OperationManagerLocal {
* @param description user-entered description of the job to be scheduled
*
* @return the information on the new schedule
- * @throws ScheduleException TODO
+ * @throws ScheduleException if failed to schedule the operation
*/
ResourceOperationSchedule scheduleResourceOperation(Subject subject, int resourceId, String operationName,
long delay, long repeatInterval, int repeatCount, int timeout, Configuration parameters, String description)
throws ScheduleException;
+
+ /**
+ * Schedules an operation for execution on members of the given group using the cron expression.
+ *
+ * @param subject the user who is asking to schedule the job
+ * @param groupId the compatible group whose member resources are the target of the operation
+ * @param executionOrderResourceIds optional order of exection - if not<code>null</code>, these are group members
+ * resource IDs in the order in which the operations are invoked
+ * @param haltOnFailure if <code>true</code>, the group operation will halt whenever one individual
+ * resource fails to execute. When executing in order, this means once a failure
+ * occurs, the resources next in line to execute will abort and not attempt to
+ * execute. If not executing in any particular order, you are not guaranteed which
+ * will stop and which will continue since all are executed as fast as possible,
+ * but the group operation will attempt to stop as best it can.
+ * @param operationName the actual operation to invoke
+ * @param parameters optional parameters to pass into the operation
+ * @param cronExpression the cron expression specifying the repetition.
+ * For example:
+ * <pre>
+ * 0 0 12 * * ? Fire at 12pm (noon) every day
+ * 0 15 10 ? * * Fire at 10:15am every day
+ * 0 15 10 * * ? Fire at 10:15am every day
+ * 0 15 10 * * ? * Fire at 10:15am every day
+ * 0 15 10 * * ? 2005 Fire at 10:15am every day during the year 2005
+ * 0 * 14 * * ? every minute starting at 2pm and ending at 2:59pm, every day
+ * 0 0/5 14 * * ? every 5 minutes starting at 2pm and ending at 2:55pm, ev. d.
+ * 0 0-5 14 * * ? Fire every minute starting at 2pm and ending at 2:05pm, every day
+ * 0 10,44 14 ? 3 WED Fire at 2:10pm and at 2:44pm every Wednesday in the month of March.
+ * 0 15 10 ? * MON-FRI Fire at 10:15am every Monday, Tuesday, Wednesday, Thursday and Friday
+ * 0 15 10 15 * ? Fire at 10:15am on the 15th day of every month
+ * 0 15 10 L * ? Fire at 10:15am on the last day of every month
+ * 0 15 10 ? * 6L Fire at 10:15am on the last Friday of every month
+ * 0 15 10 ? * 6L Fire at 10:15am on the last Friday of every month
+ * 0 15 10 ? * 6L 2002-2005 at 10:15am on every last friday of every month during the years
+ * 0 15 10 ? * 6#3 Fire at 10:15am on the third Friday of every month
+ * 0 11 11 11 11 ? Fire every November 11th at 11:11am.
+ * </pre>
+ * @param timeout the number of seconds before this operation will fail due to timeout. 0 for no timeout.
+ * are ignored and reset by this method)
+ * @param description user-entered description of the job to be scheduled
+ *
+ * @return the information on the new schedule
+ *
+ * @throws SchedulerException if failed to schedule the operation
+ */
+ GroupOperationSchedule scheduleGroupOperationUsingCron(Subject subject, int groupId,
+ int[] executionOrderResourceIds, boolean haltOnFailure, String operationName, Configuration parameters,
+ String cronExpression, int timeout, String description) throws ScheduleException;
/**
* Unschedules the resource operation identified with the given job ID.
@@ -644,7 +731,7 @@ public interface OperationManagerLocal {
* @param subject the user who is asking to unschedule the operation
* @param jobId identifies the operation to unschedule
* @param resourceId the ID of the resource whose operation is getting unscheduled
- * @throws UnscheduleException TODO
+ * @throws UnscheduleException if failed to schedule the operation
*/
void unscheduleResourceOperation(Subject subject, String jobId, int resourceId) throws UnscheduleException;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
index c6f8da1..8a4bf1d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
@@ -22,6 +22,8 @@ import java.util.List;
import javax.ejb.Remote;
+import org.quartz.SchedulerException;
+
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.criteria.GroupOperationHistoryCriteria;
@@ -111,11 +113,49 @@ public interface OperationManagerRemote {
* user-entered description of the job to be scheduled
*
* @return the information on the new schedule
- * @throws ScheduleException TODO
+ * @throws ScheduleException if failed to schedule the operation
*/
ResourceOperationSchedule scheduleResourceOperation(Subject subject, int resourceId, String operationName,
long delay, long repeatInterval, int repeatCount, int timeout, Configuration parameters, String description)
throws ScheduleException;
+
+ /**
+ * Schedules a Resource operation for execution using the cron expression.
+ *
+ * @param subject the user who is asking to schedule the job
+ * @param resourceId the resource that is the target of the operation
+ * @param operationName the actual operation to invoke
+ * @param cronExpression the cron expression specifying the repetition.
+ * For example:
+ * <pre>
+ * 0 0 12 * * ? Fire at 12pm (noon) every day
+ * 0 15 10 ? * * Fire at 10:15am every day
+ * 0 15 10 * * ? Fire at 10:15am every day
+ * 0 15 10 * * ? * Fire at 10:15am every day
+ * 0 15 10 * * ? 2005 Fire at 10:15am every day during the year 2005
+ * 0 * 14 * * ? every minute starting at 2pm and ending at 2:59pm, every day
+ * 0 0/5 14 * * ? every 5 minutes starting at 2pm and ending at 2:55pm, ev. d.
+ * 0 0-5 14 * * ? Fire every minute starting at 2pm and ending at 2:05pm, every day
+ * 0 10,44 14 ? 3 WED Fire at 2:10pm and at 2:44pm every Wednesday in the month of March.
+ * 0 15 10 ? * MON-FRI Fire at 10:15am every Monday, Tuesday, Wednesday, Thursday and Friday
+ * 0 15 10 15 * ? Fire at 10:15am on the 15th day of every month
+ * 0 15 10 L * ? Fire at 10:15am on the last day of every month
+ * 0 15 10 ? * 6L Fire at 10:15am on the last Friday of every month
+ * 0 15 10 ? * 6L Fire at 10:15am on the last Friday of every month
+ * 0 15 10 ? * 6L 2002-2005 at 10:15am on every last friday of every month during the years
+ * 0 15 10 ? * 6#3 Fire at 10:15am on the third Friday of every month
+ * 0 11 11 11 11 ? Fire every November 11th at 11:11am.
+ * </pre>
+ * @param timeout the number of seconds before this operation will fail due to timeout. 0 for no timeout.
+ * @param parameters the names parameters for the operation.
+ * @param description user-entered description of the job to be scheduled
+ *
+ * @return the information on the new schedule
+ *
+ * @throws SchedulerException if failed to schedule the operation
+ */
+ ResourceOperationSchedule scheduleResourceOperationUsingCron(Subject subject, int resourceId, String operationName,
+ String cronExpression, int timeout, Configuration parameters, String description) throws ScheduleException;
/**
* Unschedules the resource operation identified with the given job ID.
@@ -152,6 +192,54 @@ public interface OperationManagerRemote {
throws ScheduleException;
/**
+ * Schedules an operation for execution on members of the given group using the cron expression.
+ *
+ * @param subject the user who is asking to schedule the job
+ * @param groupId the compatible group whose member resources are the target of the operation
+ * @param executionOrderResourceIds optional order of exection - if not<code>null</code>, these are group members
+ * resource IDs in the order in which the operations are invoked
+ * @param haltOnFailure if <code>true</code>, the group operation will halt whenever one individual
+ * resource fails to execute. When executing in order, this means once a failure
+ * occurs, the resources next in line to execute will abort and not attempt to
+ * execute. If not executing in any particular order, you are not guaranteed which
+ * will stop and which will continue since all are executed as fast as possible,
+ * but the group operation will attempt to stop as best it can.
+ * @param operationName the actual operation to invoke
+ * @param parameters optional parameters to pass into the operation
+ * @param cronExpression the cron expression specifying the repetition.
+ * For example:
+ * <pre>
+ * 0 0 12 * * ? Fire at 12pm (noon) every day
+ * 0 15 10 ? * * Fire at 10:15am every day
+ * 0 15 10 * * ? Fire at 10:15am every day
+ * 0 15 10 * * ? * Fire at 10:15am every day
+ * 0 15 10 * * ? 2005 Fire at 10:15am every day during the year 2005
+ * 0 * 14 * * ? every minute starting at 2pm and ending at 2:59pm, every day
+ * 0 0/5 14 * * ? every 5 minutes starting at 2pm and ending at 2:55pm, ev. d.
+ * 0 0-5 14 * * ? Fire every minute starting at 2pm and ending at 2:05pm, every day
+ * 0 10,44 14 ? 3 WED Fire at 2:10pm and at 2:44pm every Wednesday in the month of March.
+ * 0 15 10 ? * MON-FRI Fire at 10:15am every Monday, Tuesday, Wednesday, Thursday and Friday
+ * 0 15 10 15 * ? Fire at 10:15am on the 15th day of every month
+ * 0 15 10 L * ? Fire at 10:15am on the last day of every month
+ * 0 15 10 ? * 6L Fire at 10:15am on the last Friday of every month
+ * 0 15 10 ? * 6L Fire at 10:15am on the last Friday of every month
+ * 0 15 10 ? * 6L 2002-2005 at 10:15am on every last friday of every month during the years
+ * 0 15 10 ? * 6#3 Fire at 10:15am on the third Friday of every month
+ * 0 11 11 11 11 ? Fire every November 11th at 11:11am.
+ * </pre>
+ * @param timeout the number of seconds before this operation will fail due to timeout. 0 for no timeout.
+ * are ignored and reset by this method)
+ * @param description user-entered description of the job to be scheduled
+ *
+ * @return the information on the new schedule
+ *
+ * @throws SchedulerException if failed to schedule the operation
+ */
+ GroupOperationSchedule scheduleGroupOperationUsingCron(Subject subject, int groupId,
+ int[] executionOrderResourceIds, boolean haltOnFailure, String operationName, Configuration parameters,
+ String cronExpression, int timeout, String description) throws ScheduleException;
+
+ /**
* Unschedules the group operation identified with the given job ID.
*
* @param subject the user who is asking to unschedule the operation
1
0
[rhq] Branch 'feature/cassandra-backend' - 7 commits - .classpath modules/core modules/enterprise modules/integration-tests modules/plugins
by John Sanda 25 Jan '13
by John Sanda 25 Jan '13
25 Jan '13
.classpath | 24
modules/core/native-system/src/main/java/org/rhq/core/system/AggregateProcessInfo.java | 13
modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java | 457 ++++++++--
modules/core/native-system/src/test/java/org/rhq/core/system/ProcessInfoRefreshIntervalTest.java | 175 +++
modules/core/native-system/src/test/resources/org/rhq/core/system/bash-watch-echo.sh | 7
modules/core/native-system/src/test/resources/org/rhq/core/system/win-watch-echo.bat | 5
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java | 24
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java | 216 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java | 193 ----
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 86 +
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 87 +
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 1
modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java | 9
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 11
modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java | 70 -
modules/plugins/jboss-as-5/pom.xml | 17
modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java | 2
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessComponent.java | 27
modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java | 43
29 files changed, 1120 insertions(+), 386 deletions(-)
New commits:
commit d26cf3d099aa0c42c79ca097cc8b1c63db3b0c25
Merge: 52b4fd7 8e27a3a
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Jan 25 10:58:35 2013 -0500
Merge branch 'master' into feature/cassandra-backend
Conflicts:
.classpath
diff --cc .classpath
index 375538e,9af3a50..41e047a
--- a/.classpath
+++ b/.classpath
@@@ -345,14 -343,12 +353,16 @@@
<classpathentry exported="true" kind="var" path="M2_REPO/org/picketbox/picketbox/4.0.7.Final/picketbox-4.0.7.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/python/jython-standalone/2.5.2/jython-standalone-2.5.2.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/com/wordnik/swagger-annotations_2.9.1/1.1.1-SNAPSHOT/swagger-annotations_2.9.1-1.1.1-20121031.024335-6.jar"/>
- <classpathentry exported="true" kind="var" path="JDK_HOME/lib/tools.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/joda-time/joda-time/2.1/joda-time-2.1.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/cassandra/cassandra-thrift/1.1.5/cassandra-thrift-1.1.5.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/hectorclient/hector-core/1.1-1/hector-core-1.1-1.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-install/1.5.2/byteman-install-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-install/1.5.2/byteman-install-1.5.2-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-submit/1.5.2/byteman-submit-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-submit/1.5.2/byteman-submit-1.5.2-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-bmunit/1.5.2/byteman-bmunit-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-bmunit/1.5.2/byteman-bmunit-1.5.2-sources.jar"/>
- <classpathentry exported="true" kind="var" path="JDK_HOME/lib/tools.jar"/>
- <classpathentry kind="output" path="eclipse-classes"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cassandra/cassandra-thrift/1.2.0-beta2/cassandra-thrift-1.2.0-beta2.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/hectorclient/hector-core/1.1-1/hector-core-1.1-1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cassandra/cassandra-all/1.2.0-beta2/cassandra-all-1.2.0-beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/datastax/cassandra/cassandra-driver-core/0.1.0-SNAPSHOT/cassandra-driver-core-0.1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/thrift/libthrift/0.7.0/libthrift-0.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/12.0/guava-12.0.jar"/>
+ <classpathentry kind="output" path="eclipse-classes"/>
</classpath>
commit 8e27a3acaf35b70ed191b6890cdfd1cc482d82b8
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Jan 25 10:43:53 2013 -0500
make sure we clean up when downloading jboss distro
The ant script that downloads the jboss distro could time out leaving a corrupt
zip file in the tmp dir. This would cause the build to fail and was also
causing subsequent CI builds to fail. Once again, doing tear down in the set up
fixes the problem.
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 2474eec..9c71f33 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -473,6 +473,21 @@
<target>
<property name="as5.zipfile"
location="${java.io.tmpdir}${file.separator}jboss-as-${as5.version}.zip"/>
+
+ <!--
+ Go ahead and clean up the tmp dir first. If in a prior build,
+ we timeout while downloading the jboss distro, we will be left
+ with a corrupt zip file which will cause the build to fail as
+ expected; however, if we do not clean up, then subsequent
+ builds fail as well. Alternatively we could try and set the
+ skipexisting attribute on the get task to false which might
+ also work and be faster but this way ensures we get the
+ correct bits.
+ -->
+ <delete file="${as5.zipfile}"/>
+ <delete dir="${java.io.tmpdir}/jboss-eap-${as5.version}" failonerror="false"/>
+ <delete dir="${jboss5.home}"/>
+
<get src="${as5.url}" dest="${as5.zipfile}"
usetimestamp="true" verbose="true"/>
<unzip src="${as5.zipfile}" dest="${java.io.tmpdir}"/>
@@ -480,7 +495,7 @@
<move file="${java.io.tmpdir}/jboss-${as5.version}"
tofile="${jboss5.home}" failonerror="false"
overwrite="false"/>
- <!-- This works for EAP versions -->
+ <!-- This works for EAP versions -->
<move file="${java.io.tmpdir}/jboss-eap-${as5.version}/jboss-as"
tofile="${jboss5.home}" failonerror="false"
overwrite="false"/>
commit 33f65e91a7b5121774d4e6928bb16ec95a87836e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 25 08:50:06 2013 -0500
point to the proper RHQ wiki docs
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
index b48dd19..c5fa4dc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
@@ -326,7 +326,7 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain
DashboardPortlet news = new DashboardPortlet(MashupPortlet.NAME, MashupPortlet.KEY, 300);
if (isRHQ) {
news.getConfiguration()
- .put(new PropertySimple("address", "https://docs.jboss.org/author/display/RHQ/Home"));
+ .put(new PropertySimple("address", "https://docs.jboss.org/author/display/RHQ/User+Documentation"));
} else {
news.getConfiguration().put(
new PropertySimple("address",
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties
index c3b641e..1e3fbe3 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties
@@ -35,7 +35,7 @@ view_help_section_1_item_count = 3
view_help_section_1_propTitle_1 = Frequently Asked Questions (FAQ)
view_help_section_1_propUrl_1 = https://docs.jboss.org/author/display/RHQ/FAQ
view_help_section_1_propTitle_2 = Documentation Set
-view_help_section_1_propUrl_2 = https://docs.jboss.org/author/display/RHQ/Home
+view_help_section_1_propUrl_2 = https://docs.jboss.org/author/display/RHQ/User+Documentation
view_help_section_1_propTitle_3 = API Javadoc
view_help_section_1_propUrl_3 = https://docs.jboss.org/author/display/RHQ/API+Documentation
@@ -48,7 +48,7 @@ view_help_section_2_propTitle_2 = Demo: Bundle Provisioning
view_help_section_2_propUrl_2 = http://management-platform.blogspot.com/2011/01/bundle-provisioning-via-rhq…
view_help_section_2_propTitle_3 = How to build Group Definitions
view_help_section_2_propIcon_3 = [SKIN]/../actions/help.png
-view_help_section_2_propUrl_3 = http://docs.redhat.com/docs/en-US/JBoss_Operations_Network/2.4/html/Basic_A…
+view_help_section_2_propUrl_3 = https://docs.jboss.org/author/display/RHQ/Group+Definitions
view_help_section_2_propTitle_4 = How to use the Search Bar
view_help_section_2_propIcon_4 = [SKIN]/../actions/help.png
view_help_section_2_propUrl_4 = https://docs.jboss.org/author/display/RHQ/Search
commit 269da6354ef305638316aae2bdcd7039bde62cf3
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Fri Jan 25 10:06:43 2013 +0100
Fix Eclipse classpath file: CDI and javax.inject
diff --git a/.classpath b/.classpath
index 6091ec8..9af3a50 100644
--- a/.classpath
+++ b/.classpath
@@ -336,7 +336,9 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Final/jboss-jms-api_1.1_spec-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/spec/javax/interceptor/jboss-interceptors-api_1.1_spec/1.0.0.Final/jboss-interceptors-api_1.1_spec-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/remotingjmx/remoting-jmx/1.0.2.Final/remoting-jmx-1.0.2.Final.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/remotingjmx/remoting-jmx/1.0.2.Final/remoting-jmx-1.0.2.Final.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/javax/enterprise/cdi-api/1.0-SP4/cdi-api-1.0-SP4.jar" sourcepath="M2_REPO/javax/enterprise/cdi-api/1.0-SP4/cdi-api-1.0-SP4-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/mozilla/rhino/1.7R4/rhino-1.7R4.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/picketbox/picketbox/4.0.7.Final/picketbox-4.0.7.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/python/jython-standalone/2.5.2/jython-standalone-2.5.2.jar"/>
commit 3ded44d88b2700c95d3e107d2cfdbe48524a41e8
Author: Thomas SEGISMONT <tsegismo(a)redhat.com>
Date: Mon Dec 10 21:53:49 2012 +0100
Bug 885664 OpenSSHD and MySQL availability check may report stale data
Refactoring of ProcessInfo
The class has now a subtype which groups non static data and operations on this data.
The purpose is to make clear for users of the class that it caches data and only takes snaphots via SIGAR calls
OpenSSHDComponent and MySQLComponent have their availability check fixed and using this API
Other classes were updated with new API calls for isRunning method
Add lock and interval mechanism to ProcessInfo refresh
This will avoid SIGAR bug when making too close calls to getProcState
Add corresponding test
Fix bad log in ApacheExecutionUtil
Modified Eclipse classpath file
diff --git a/.classpath b/.classpath
index e7fd638..6091ec8 100644
--- a/.classpath
+++ b/.classpath
@@ -13,7 +13,6 @@
<classpathentry kind="src" path="modules/cli-tests/src/main/java"/>
<classpathentry kind="src" path="modules/helpers/jeeGen/src/main/java"/>
<classpathentry kind="src" path="modules/helpers/bundleGen/src/main/java"/>
- <classpathentry kind="src" path="modules/integration-tests/jndi-access/jndi-access-test/src/test/java"/>
<classpathentry kind="src" path="modules/common/drift/src/main/java"/>
<classpathentry kind="src" path="modules/common/drift/src/test/java"/>
<classpathentry kind="src" path="modules/common/ant-bundle/src/test/java"/>
@@ -25,8 +24,9 @@
<classpathentry kind="src" path="modules/core/util/src/test/java"/>
<classpathentry kind="src" path="modules/core/dbutils/src/main/java"/>
<classpathentry kind="src" path="modules/core/dbutils/src/test/java"/>
- <classpathentry kind="src" path="modules/core/native-system/src/main/java"/>
- <classpathentry kind="src" path="modules/core/native-system/src/test/java"/>
+ <classpathentry kind="src" path="modules/core/native-system/src/main/java"/>
+ <classpathentry kind="src" path="modules/core/native-system/src/test/java"/>
+ <classpathentry kind="src" path="modules/core/native-system/src/test/resources"/>
<classpathentry kind="src" path="modules/core/domain/src/main/java"/>
<classpathentry kind="src" path="modules/core/domain/src/test/java"/>
<classpathentry kind="src" path="modules/core/plugin-api/src/main/java"/>
@@ -119,7 +119,9 @@
<classpathentry kind="src" path="modules/plugins/oracle/src/main/java"/>
<classpathentry kind="src" path="modules/plugins/oracle/src/test/java"/>
<classpathentry kind="src" path="modules/plugins/apache/src/main/java"/>
+ <classpathentry kind="src" path="modules/plugins/apache/src/main/resources"/>
<classpathentry kind="src" path="modules/plugins/apache/src/test/java"/>
+ <classpathentry kind="src" path="modules/plugins/apache/src/test/resources"/>
<classpathentry kind="src" path="modules/plugins/script/src/main/java"/>
<classpathentry kind="src" path="modules/plugins/netservices/src/main/java"/>
<classpathentry kind="src" path="modules/plugins/ant-bundle/src/main/java"/>
@@ -176,7 +178,11 @@
<classpathentry kind="src" path="modules/core/arquillian-integration/container/src/test/java"/>
<classpathentry kind="src" path="modules/core/arquillian-integration/container/src/test/resources"/>
<classpathentry kind="src" path="modules/test-utils/src/main/java"/>
- <classpathentry kind="src" path="modules/integration-tests/mod_cluster-plugin-test/src/test/java"/>
+ <classpathentry kind="src" path="modules/integration-tests/apache-plugin-test/src/test/java"/>
+ <classpathentry kind="src" path="modules/integration-tests/apache-plugin-test/src/test/resources"/>
+ <classpathentry kind="src" path="modules/integration-tests/jndi-access/jndi-access-test/src/test/java"/>
+ <classpathentry kind="src" path="modules/integration-tests/jndi-access/jndi-access-test/src/test/resources"/>
+ <classpathentry kind="src" path="modules/integration-tests/mod_cluster-plugin-test/src/test/java"/>
<classpathentry kind="src" path="etc/samples/skeleton-plugin/src/main/java"/>
<classpathentry kind="src" path="etc/samples/custom-serverplugin/src/main/java"/>
<classpathentry kind="src" path="etc/samples/simplereport-serverplugin/src/main/java"/>
@@ -239,7 +245,7 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.3.3.Final/richfaces-ui-3.3.3.Final.jar" sourcepath="/M2_REPO/org/richfaces/ui/richfaces-ui/3.3.0.GA/richfaces-ui-3.3.0.GA-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/postgresql/postgresql/9.2-1002.jdbc4/postgresql-9.2-1002.jdbc4.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.5.132-3/sigar-1.6.5.132-3.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.3.82/sigar-1.6.3.82-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.5.132-3/sigar-1.6.5.132-3.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.5.132-3/sigar-1.6.5.132-3-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jbossts/jbossjts/4.16.2.Final/jbossjts-4.16.2.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.jar"/>
@@ -335,9 +341,12 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/picketbox/picketbox/4.0.7.Final/picketbox-4.0.7.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/python/jython-standalone/2.5.2/jython-standalone-2.5.2.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/com/wordnik/swagger-annotations_2.9.1/1.1.1-SNAPSHOT/swagger-annotations_2.9.1-1.1.1-20121031.024335-6.jar"/>
- <classpathentry exported="true" kind="var" path="JDK_HOME/lib/tools.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/joda-time/joda-time/2.1/joda-time-2.1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/apache/cassandra/cassandra-thrift/1.1.5/cassandra-thrift-1.1.5.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/hectorclient/hector-core/1.1-1/hector-core-1.1-1.jar"/>
- <classpathentry kind="output" path="eclipse-classes"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-install/1.5.2/byteman-install-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-install/1.5.2/byteman-install-1.5.2-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-submit/1.5.2/byteman-submit-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-submit/1.5.2/byteman-submit-1.5.2-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-bmunit/1.5.2/byteman-bmunit-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-bmunit/1.5.2/byteman-bmunit-1.5.2-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="JDK_HOME/lib/tools.jar"/>
+ <classpathentry kind="output" path="eclipse-classes"/>
</classpath>
diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/AggregateProcessInfo.java b/modules/core/native-system/src/main/java/org/rhq/core/system/AggregateProcessInfo.java
index 271a869..144c4f4 100644
--- a/modules/core/native-system/src/main/java/org/rhq/core/system/AggregateProcessInfo.java
+++ b/modules/core/native-system/src/main/java/org/rhq/core/system/AggregateProcessInfo.java
@@ -24,10 +24,10 @@ package org.rhq.core.system;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.HashSet;
import org.hyperic.sigar.ProcCpu;
import org.hyperic.sigar.ProcFd;
@@ -110,23 +110,26 @@ public class AggregateProcessInfo extends ProcessInfo {
// There are some instances where SIGAR can't get one or more of these (maybe permission issues?).
// Do not bomb if we can't get one or more of these - we'll just handle nulls appropriately.
+ // It is safe to get the prior snapshot as we just called super.refresh
+ ProcessInfoSnapshot priorSnaphot = priorSnaphot();
+
try {
- procTimes.add(super.procTime);
+ procTimes.add(priorSnaphot.getTime());
} catch (Exception e) {
}
try {
- procMems.add(super.procMem);
+ procMems.add(priorSnaphot.getMemory());
} catch (Exception e) {
}
try {
- procCpus.add(super.procCpu);
+ procCpus.add(priorSnaphot.getCpu());
} catch (Exception e) {
}
try {
- procFds.add(super.procFd);
+ procFds.add(priorSnaphot.getFileDescriptor());
} catch (Exception e) {
}
diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java b/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java
index 39b0f0f..7f994ed 100644
--- a/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java
+++ b/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
+ * Copyright (C) 2005-2013 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -49,39 +51,229 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
+ * <p>
* Encapsulates information about a known process.
+ * </p>
+ * <p>
+ * A few process properties (i.e. PID, command line) will never change during the lifetime of the process and can be
+ * read directly with this class accessors. Other process properties (i.e. state, cpu usage) will vary and their values
+ * are grouped in {@link ProcessInfoSnapshot} instances.
+ * </p>
+ * <p>
+ * Operations on static properties of the process must be implemented in the {@link ProcessInfo} type. Operations on
+ * non static properties must be implemented in the {@link ProcessInfoSnapshot} type. The {@link ProcessInfoSnapshot}
+ * subtype has been created to remind users of the class that they are working with cached data.
+ * </p>
+ * <p>For example, if you want to be sure a process is still alive, you should use this code:<br>
+ * <code>processInfo.freshSnapshot().isRunning()</code>
+ * </p>
+ * <p>Rather than:<br>
+ * <code>processInfo.priorSnapshot().isRunning()</code>
+ * </p>
*
* @author John Mazzitelli
* @author Ian Springer
+ * @author Thomas Segismont
*/
public class ProcessInfo {
- private final Log log = LogFactory.getLog(ProcessInfo.class.getName());
+
+ /**
+ * <p>
+ * Exposes non static process properties and operations computed on them (like {@link #isRunning()} method).
+ * Operations on non static process properties should all be implemented here.
+ * </p>
+ * <p>
+ * New snapshots are created when {@link ProcessInfo#refresh()} or {@link ProcessInfo#freshSnapshot()} are
+ * called.
+ * </p>
+ * <p>
+ * Note the current implementation does not actually encapsulate these properties for backward compatibility
+ * reasons (we have to keep the write access to {@link ProcessInfo} protected properties).
+ * </p>
+ */
+ public final class ProcessInfoSnapshot {
+
+ public long getParentPid() throws SystemInfoException {
+ return (ProcessInfo.this.procState != null) ? ProcessInfo.this.procState.getPpid() : 0L;
+ }
+
+ public ProcState getState() throws SystemInfoException {
+ return ProcessInfo.this.procState;
+ }
+
+ public ProcExe getExecutable() throws SystemInfoException {
+ return ProcessInfo.this.procExe;
+ }
+
+ public ProcTime getTime() throws SystemInfoException {
+ return ProcessInfo.this.procTime;
+ }
+
+ public ProcMem getMemory() throws SystemInfoException {
+ return ProcessInfo.this.procMem;
+ }
+
+ public ProcCpu getCpu() throws SystemInfoException {
+ return ProcessInfo.this.procCpu;
+ }
+
+ public ProcFd getFileDescriptor() throws SystemInfoException {
+ return ProcessInfo.this.procFd;
+ }
+
+ public ProcCred getCredentials() throws SystemInfoException {
+ return ProcessInfo.this.procCred;
+ }
+
+ public ProcCredName getCredentialsName() throws SystemInfoException {
+ return ProcessInfo.this.procCredName;
+ }
+
+ /**
+ * @return null if process executable or cwd is unavailable. Otherwise the Cwd as returned from the
+ * process executable.
+ * @throws SystemInfoException
+ */
+ public String getCurrentWorkingDirectory() throws SystemInfoException {
+ String result = null;
+ try {
+ if (null != ProcessInfo.this.procExe) {
+ result = ProcessInfo.this.procExe.getCwd();
+ }
+ } catch (Exception e) {
+ ProcessInfo.this.handleSigarCallException(e, "procExe.getCwd()");
+ }
+ return result;
+ }
+
+ /**
+ * Checks if the process is alive.
+ *
+ * @return true if the process is running, sleeping or idle
+ * @throws SystemInfoException
+ */
+ public boolean isRunning() throws SystemInfoException {
+ boolean running = false;
+ if (ProcessInfo.this.procState != null) {
+ running = (ProcessInfo.this.procState.getState() == ProcState.RUN
+ || ProcessInfo.this.procState.getState() == ProcState.SLEEP || ProcessInfo.this.procState
+ .getState() == ProcState.IDLE);
+
+ }
+ return running;
+ }
+
+ }
+
+ private static final Log LOG = LogFactory.getLog(ProcessInfo.class);
+
+ // This interval was introduced because of a SIGAR bug: too close calls to getProcState could
+ // return different values even if the underlying process state has not changed.
+ private static final int REFRESH_INTERVAL_MILLIS = 1000 * 2;
+
+ // This timeout should always be greater than the refresh interval as one thread which acquired the lock
+ // could be waiting for the refresh interval to elapse. This value is deliberately high because multiple
+ // threads could wait for the lock and each of them will also have to wait for the refresh interval to elapse.
+ private static final int REFRESH_LOCK_ACQUIRE_TIMEOUT_SECONDS = 30;
+
+ private static final String UNKNOWN_PROCESS_NAME = "?";
+
+ private static final Set<String> MS_WINDOWS_TERMINATE_SIGNAL_NAMES = new HashSet<String>();
+ static {
+ MS_WINDOWS_TERMINATE_SIGNAL_NAMES.add("INT");
+ MS_WINDOWS_TERMINATE_SIGNAL_NAMES.add("KILL");
+ MS_WINDOWS_TERMINATE_SIGNAL_NAMES.add("QUIT");
+ MS_WINDOWS_TERMINATE_SIGNAL_NAMES.add("TERM");
+ }
protected boolean initialized;
+ protected SigarProxy sigar;
+
// these are static - values remain for the life of this object
protected long pid;
protected String name;
- protected String baseName;
protected String[] commandLine;
+ protected Map<String, String> procEnv;
+
+ // these are computed once with static data (purposely lazy in order to speed up discovery process)
protected Map<String, String> environmentVariables;
- protected SigarProxy sigar;
+ protected String baseName;
+
+ // this one is computed once with non static data
+ protected ProcessInfo parentProcess;
// these are refreshed and may change during the life of the process
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcState procState;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcExe procExe;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcTime procTime;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcMem procMem;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcCpu procCpu;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcFd procFd;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcCred procCred;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcCredName procCredName;
- protected Map<String, String> procEnv;
- protected transient ProcessInfo parentProcess;
- protected transient boolean processDied;
+ // Set to true in handleSigarCallException
+ protected boolean processDied;
+
+ // Set to true if a SIGAR permission error has already been logged
private boolean loggedPermissionsError = false;
- private static final String UNKNOWN = "?";
+
+ // The last snasphot of non static process properties
+ // In a future implementation a new snapshot will be created on each call to refresh
+ private ProcessInfoSnapshot snapshot = new ProcessInfoSnapshot();
+
+ private long nextRefreshTime = System.currentTimeMillis();
+
+ private ReentrantLock refreshLock = new ReentrantLock();
// useful for mocking this object, this is purposely not public
protected ProcessInfo() {
@@ -97,15 +289,58 @@ public class ProcessInfo {
update(pid);
}
+ /**
+ * Takes a fresh snapshot of non static properties of the underlying process
+ *
+ * @throws SystemInfoException
+ */
public void refresh() throws SystemInfoException {
- update(this.pid);
+ // SIGAR has a bug: too close calls to getProcState could return different values even if the underlying
+ // process state has not changed. To be sure to get correct data, a lock and an interval were introduced.
+ // Calling threads must acquire the lock and then make sure the interval has elapsed before calling update.
+ boolean acquiredLock = false;
+ try {
+ acquiredLock = refreshLock.tryLock(REFRESH_LOCK_ACQUIRE_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ LOG.error("Thread interrupted while trying to acquire ProcessInfo[" + this.pid + "] refresh lock", e);
+ }
+ if (!acquiredLock) {
+ throw new RuntimeException("Could not acquire ProcessInfo[" + this.pid + "] refresh lock");
+ }
+ try {
+ waitForNextRefreshTime();
+ update(this.pid);
+ } finally {
+ nextRefreshTime = System.currentTimeMillis() + REFRESH_INTERVAL_MILLIS;
+ refreshLock.unlock();
+ }
+ }
+
+ private void waitForNextRefreshTime() {
+ for (;;) {
+ long timeToNextRefresh = nextRefreshTime - System.currentTimeMillis();
+ if (timeToNextRefresh > 0) {
+ try {
+ Thread.sleep(timeToNextRefresh);
+ break;
+ } catch (InterruptedException ignore) {
+ }
+ } else {
+ break;
+ }
+ }
}
+ // Refresh and update methods cannot be merged because subclasses may override refresh behavior
+ // and we can't be sure that instances will already be properly initialized.
private void update(long pid) throws SystemInfoException {
long startTime = System.currentTimeMillis();
try {
+
this.processDied = false;
+ // Get ProcState and ProcExe before static data as they can help to determine the name field in some cases.
+
ProcState procState = null;
try {
procState = sigar.getProcState(pid);
@@ -138,7 +373,7 @@ public class ProcessInfo {
try {
this.procEnv = sigar.getProcEnv(pid);
if (this.procEnv == null) {
- log.debug("SIGAR returned a null environment for [" + this.baseName + "] process with pid ["
+ LOG.debug("SIGAR returned a null environment for [" + getBaseName() + "] process with pid ["
+ this.pid + "].");
}
} catch (Exception e) {
@@ -190,14 +425,39 @@ public class ProcessInfo {
} catch (Exception e) {
throw new SystemInfoException(e);
}
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
long elapsedTime = System.currentTimeMillis() - startTime;
- log.trace("Retrieval of process info for pid " + pid + " took " + elapsedTime + " ms.");
+ LOG.trace("Retrieval of process info for pid " + pid + " took " + elapsedTime + " ms.");
}
this.processDied = false;
}
+ /**
+ * <p>
+ * Returns the last snasphot of the non static process properties.
+ * </p>
+ * <p>
+ * Caveat the returned may hold stale data has it was taken with previous SIGAR calls.
+ * Calling {@link #freshSnapshot()} instead is almost always a better idea.
+ * </p>
+ *
+ * @return a {@link ProcessInfoSnapshot} possibly holding stale data
+ */
+ public ProcessInfoSnapshot priorSnaphot() {
+ return snapshot;
+ }
+
+ /**
+ * Takes a fresh snapshot of the non static process properties.
+ *
+ * @return a fresh {@link ProcessInfoSnapshot}
+ */
+ public ProcessInfoSnapshot freshSnapshot() {
+ refresh();
+ return snapshot;
+ }
+
public void destroy() throws SystemInfoException {
if (this.sigar instanceof Sigar) {
try {
@@ -215,7 +475,7 @@ public class ProcessInfo {
return;
}
- if (isWindows() && (this.pid == 0 || this.pid == 4)) {
+ if (OperatingSystem.IS_WIN32 && (this.pid == 0 || this.pid == 4)) {
// On Windows, Pid 0 and Pid 4 are special Kernel processes (Pid 0 is the "System Idle Process" and Pid 4 is
// the "System" process). For these processes, it's normal for many of the Sigar.getProc calls to fail, so
// there's no need to log anything.
@@ -227,29 +487,28 @@ public class ProcessInfo {
if (!this.loggedPermissionsError) {
// Only log permissions errors once per process.
String currentUserName = System.getProperty("user.name");
- log
- .trace("Unable to obtain all info for ["
- + procName
- + "] process with pid ["
- + this.pid
- + "] - call to "
- + methodName
- + "failed. "
- + "The process is most likely owned by a user other than the user that owns the RHQ plugin container's process ("
- + currentUserName + ").");
+ LOG.trace("Unable to obtain all info for ["
+ + procName
+ + "] process with pid ["
+ + this.pid
+ + "] - call to "
+ + methodName
+ + "failed. "
+ + "The process is most likely owned by a user other than the user that owns the RHQ plugin container's process ("
+ + currentUserName + ").");
this.loggedPermissionsError = true;
}
} else if (e instanceof SigarNotImplementedException) {
- log.trace("Unable to obtain all info for [" + procName + "] process with pid [" + this.pid + "] - call to "
+ LOG.trace("Unable to obtain all info for [" + procName + "] process with pid [" + this.pid + "] - call to "
+ methodName + "failed. Cause: " + e);
} else {
if (!exists()) {
- log.debug("Attempt to refresh info for process with pid [" + this.pid
- + "] failed, because the process is no longer running.");
+ LOG.debug("Attempt to refresh info for process with pid [" + this.pid
+ + "] failed, because the process is no longer running.");
this.processDied = true;
}
- log.debug("Unexpected error occurred while looking up info for [" + procName + "] process with pid ["
+ LOG.debug("Unexpected error occurred while looking up info for [" + procName + "] process with pid ["
+ this.pid + "] - call to " + methodName + " failed. Did the process die? Cause: " + e);
}
}
@@ -260,7 +519,7 @@ public class ProcessInfo {
pids = sigar.getProcList();
} catch (SigarException e1) {
// TODO (ips, 04/30/12): It probably makes more sense to let this exception bubble up.
- log.error("Failed to obtain process list.", e1);
+ LOG.error("Failed to obtain process list.", e1);
return true;
}
@@ -274,10 +533,6 @@ public class ProcessInfo {
return foundProcess;
}
- private static boolean isWindows() {
- return File.separatorChar == '\\';
- }
-
private String determineName(String[] procArgs, ProcExe procExe, ProcState procState) {
String name;
if ((procArgs != null) && (procArgs.length != 0)) {
@@ -286,9 +541,10 @@ public class ProcessInfo {
name = procExe.getName();
} else if ((procState != null) && (procState.getName() != null)) {
String stateName = procState.getName();
- name = ((stateName.indexOf(File.separatorChar) >= 0) && (new File(stateName).exists())) ? stateName : UNKNOWN;
+ name = ((stateName.indexOf(File.separatorChar) >= 0) && (new File(stateName).exists())) ? stateName
+ : UNKNOWN_PROCESS_NAME;
} else {
- name = UNKNOWN;
+ name = UNKNOWN_PROCESS_NAME;
}
return name;
}
@@ -323,7 +579,7 @@ public class ProcessInfo {
*/
public String getBaseName() {
if (baseName == null) {
- baseName = (getName() != null) ? new File(getName()).getName() : UNKNOWN;
+ baseName = (getName() != null) ? new File(getName()).getName() : UNKNOWN_PROCESS_NAME;
}
return baseName;
}
@@ -361,82 +617,114 @@ public class ProcessInfo {
* @return the environment value
*/
@Nullable
- public String getEnvironmentVariable(@NotNull String name) {
+ public String getEnvironmentVariable(@NotNull
+ String name) {
if (this.procEnv == null) {
return null;
}
-
SystemInfo systemInfo = SystemInfoFactory.createJavaSystemInfo();
boolean isWindows = systemInfo.getOperatingSystemType() == OperatingSystemType.WINDOWS;
// Windows env names are case insensitive, so convert the specified name to all-caps before doing the lookup.
return getEnvironmentVariables().get((isWindows) ? name.toUpperCase() : name);
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public long getParentPid() throws SystemInfoException {
- return (this.procState != null) ? this.procState.getPpid() : 0L;
+ return priorSnaphot().getParentPid();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcState getState() throws SystemInfoException {
- return this.procState;
+ return priorSnaphot().getState();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcExe getExecutable() throws SystemInfoException {
- return this.procExe;
+ return priorSnaphot().getExecutable();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcTime getTime() throws SystemInfoException {
- return this.procTime;
+ return priorSnaphot().getTime();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcMem getMemory() throws SystemInfoException {
- return this.procMem;
+ return priorSnaphot().getMemory();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcCpu getCpu() throws SystemInfoException {
- return this.procCpu;
+ return priorSnaphot().getCpu();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcFd getFileDescriptor() throws SystemInfoException {
- return this.procFd;
+ return priorSnaphot().getFileDescriptor();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcCred getCredentials() throws SystemInfoException {
- return this.procCred;
+ return priorSnaphot().getCredentials();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcCredName getCredentialsName() throws SystemInfoException {
- return this.procCredName;
+ return priorSnaphot().getCredentialsName();
}
/**
- * @return null if process executable or cwd is unavailable. Otherwise the Cwd as returned from the
- * process executable.
- * @throws SystemInfoException
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
*/
+ @Deprecated
public String getCurrentWorkingDirectory() throws SystemInfoException {
- String result = null;
-
- try {
- if (null != this.procExe) {
- result = this.procExe.getCwd();
- }
- } catch (Exception e) {
- handleSigarCallException(e, "procExe.getCwd()");
- }
-
- return result;
+ return priorSnaphot().getCurrentWorkingDirectory();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public boolean isRunning() throws SystemInfoException {
- boolean running = false;
-
- if (this.procState != null) {
- running = (this.procState.getState() == ProcState.RUN || this.procState.getState() == ProcState.SLEEP || this.procState
- .getState() == ProcState.IDLE);
-
- }
-
- return running;
+ return priorSnaphot().isRunning();
}
/**
@@ -450,13 +738,18 @@ public class ProcessInfo {
}
/**
- * Returns the parent process of this process.
+ * Returns a {@link ProcessInfo} instance for the parent of this process.
+ *
+ * This method uses the parent process id which is not static (it can change if the parent process dies before its
+ * child). So in theory it should be moved to the {@link ProcessInfoSnapshot} type.
+ *
+ * In practice, it stays here because the parent {@link ProcessInfo} instance is cached after creation.
*
* @since 4.4
*/
public ProcessInfo getParentProcess() throws SystemInfoException {
if (this.parentProcess == null) {
- this.parentProcess = new ProcessInfo(getParentPid(), sigar);
+ this.parentProcess = new ProcessInfo(priorSnaphot().getParentPid(), sigar);
} else {
this.parentProcess.refresh();
}
@@ -515,44 +808,32 @@ public class ProcessInfo {
@Override
public String toString() {
StringBuilder s = new StringBuilder("process: ");
-
s.append("pid=[");
s.append(getPid());
s.append("], name=[");
- s.append((!getName().equals(UNKNOWN)) ? getName() : getBaseName());
+ s.append((!getName().equals(UNKNOWN_PROCESS_NAME)) ? getName() : getBaseName());
s.append("], ppid=[");
try {
- s.append(getParentPid());
+ s.append(priorSnaphot().getParentPid());
} catch (Exception e) {
s.append(e);
}
-
s.append("]");
-
return s.toString();
}
- private static final Set<String> TERMINATE_SIGNAL_NAMES = new HashSet<String>();
- static {
- TERMINATE_SIGNAL_NAMES.add("INT");
- TERMINATE_SIGNAL_NAMES.add("KILL");
- TERMINATE_SIGNAL_NAMES.add("QUIT");
- TERMINATE_SIGNAL_NAMES.add("TERM");
- }
-
private static int getSignalNumber(String signalName) {
if (signalName == null) {
throw new IllegalArgumentException("Signal name is null.");
}
-
int signalNumber;
if (OperatingSystem.IS_WIN32) {
- if (TERMINATE_SIGNAL_NAMES.contains(signalName)) {
+ if (MS_WINDOWS_TERMINATE_SIGNAL_NAMES.contains(signalName)) {
signalNumber = 1;
} else {
throw new IllegalArgumentException("Unsupported signal name: " + signalName
- + " - on Windows, the only supported signal names are " + TERMINATE_SIGNAL_NAMES
- + ", all of which return 1.");
+ + " - on Windows, the only supported signal names are " + MS_WINDOWS_TERMINATE_SIGNAL_NAMES
+ + ", all of which return 1.");
}
} else {
signalNumber = Sigar.getSigNum(signalName);
diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/ProcessInfoRefreshIntervalTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/ProcessInfoRefreshIntervalTest.java
new file mode 100644
index 0000000..84944ef
--- /dev/null
+++ b/modules/core/native-system/src/test/java/org/rhq/core/system/ProcessInfoRefreshIntervalTest.java
@@ -0,0 +1,175 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.core.system;
+
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hyperic.sigar.OperatingSystem;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import org.rhq.core.util.stream.StreamUtil;
+
+/**
+ * @author Thomas Segismont
+ */
+public class ProcessInfoRefreshIntervalTest {
+
+ private static final Log LOG = LogFactory.getLog(ProcessInfoRefreshIntervalTest.class);
+
+ private static final String KNOWN_ARG = "hellosigar";
+
+ private Process testProcess;
+
+ private ProcessInfo testProcessInfo;
+
+ private ExecutorService executorService;
+
+ @BeforeTest(alwaysRun = true)
+ public void setup() throws Exception {
+ testProcess = createTestProcess();
+ if (!isAlive(testProcess)) {
+ throw new RuntimeException("Test process is not alive");
+ }
+ NativeSystemInfo systemInfo = new NativeSystemInfo();
+ List<ProcessInfo> foundProcesses = systemInfo.getProcesses("arg|" + KNOWN_ARG + "|match=.*");
+ if (foundProcesses.size() != 1) {
+ throw new RuntimeException("Found " + foundProcesses.size() + " with arg [" + KNOWN_ARG + "]");
+ }
+ testProcessInfo = foundProcesses.iterator().next();
+ int threadCount = Runtime.getRuntime().availableProcessors();
+ executorService = Executors.newFixedThreadPool(threadCount);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Created an executor service with " + threadCount + " threads");
+ }
+ }
+
+ private Process createTestProcess() throws Exception {
+ if (OperatingSystem.IS_WIN32) {
+ // On Windows run a simple bat file which behaves like 'watch echo'
+ File batFile = File.createTempFile("win-watch-echo", ".bat");
+ batFile.deleteOnExit();
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/rhq/core/system/win-watch-echo.bat");
+ OutputStream os = new FileOutputStream(batFile);
+ StreamUtil.copy(is, os, true);
+ ProcessBuilder processBuilder = new ProcessBuilder("cmd", batFile.getAbsolutePath(), KNOWN_ARG);
+ return processBuilder.start();
+ } else {
+ // On other systems run a simple bash file which behaves like 'watch echo'
+ File bashFile = File.createTempFile("bash-watch-echo", ".sh");
+ bashFile.deleteOnExit();
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/rhq/core/system/bash-watch-echo.sh");
+ OutputStream os = new FileOutputStream(bashFile);
+ StreamUtil.copy(is, os, true);
+ ProcessBuilder processBuilder = new ProcessBuilder("bash", bashFile.getAbsolutePath(), KNOWN_ARG);
+ return processBuilder.start();
+ }
+ }
+
+ @AfterTest(alwaysRun = true)
+ public void tearDown() {
+ if (testProcess != null) {
+ testProcess.destroy();
+ testProcess = null;
+ }
+ testProcessInfo = null;
+ if (executorService != null) {
+ executorService.shutdownNow();
+ }
+ }
+
+ /**
+ * We want to be sure that conccurent calls to refresh method will result in correct process state
+ * detection - see comments in {@link ProcessInfo#refresh()}.
+ * @throws Exception
+ */
+ @Test(timeOut = 1000 * 60)
+ public void testRefreshInterval() throws Exception {
+ // Create and execute tasks which will ask a freshSnapshot of the processInfo and check if it is running
+ List<Future<Boolean>> futures = submitStateTestingTasks();
+ for (Future<Boolean> future : futures) {
+ // All tasks should see the process running
+ assertTrue(future.get());
+ }
+ // Send kill
+ testProcess.destroy();
+ // Wait for death
+ while (isAlive(testProcess)) {
+ Thread.sleep(100);
+ }
+ // Create and execute tasks again
+ futures = submitStateTestingTasks();
+ for (Future<Boolean> future : futures) {
+ // All tasks should now see the process down
+ assertFalse(future.get());
+ }
+ }
+
+ private List<Future<Boolean>> submitStateTestingTasks() {
+ List<Future<Boolean>> futures = new LinkedList<Future<Boolean>>();
+ for (int i = 0; i < 5; i++) {
+ final int index = i;
+ futures.add(executorService.submit(new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() throws Exception {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Execute state testing task[" + index + "]");
+ }
+ boolean isRunning = testProcessInfo.freshSnapshot().isRunning();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("State testing task[" + index + "] result: " + isRunning);
+ }
+ return isRunning;
+ }
+ }));
+ }
+ return futures;
+ }
+
+ private boolean isAlive(Process process) {
+ if (process == null) {
+ return false;
+ }
+ try {
+ process.exitValue();
+ return false;
+ } catch (IllegalThreadStateException e) {
+ return true;
+ }
+ }
+
+}
diff --git a/modules/core/native-system/src/test/resources/org/rhq/core/system/bash-watch-echo.sh b/modules/core/native-system/src/test/resources/org/rhq/core/system/bash-watch-echo.sh
new file mode 100644
index 0000000..7d0f4c0
--- /dev/null
+++ b/modules/core/native-system/src/test/resources/org/rhq/core/system/bash-watch-echo.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+while :
+do
+ echo $1
+ sleep 1
+done
diff --git a/modules/core/native-system/src/test/resources/org/rhq/core/system/win-watch-echo.bat b/modules/core/native-system/src/test/resources/org/rhq/core/system/win-watch-echo.bat
new file mode 100644
index 0000000..4404159
--- /dev/null
+++ b/modules/core/native-system/src/test/resources/org/rhq/core/system/win-watch-echo.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+:loop
+ echo %1
+ timeout /t 2
+goto loop
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java
index 76ccf39..16d7bbc 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java
@@ -310,6 +310,9 @@ public class ResourceContext<T extends ResourceComponent<?>> {
* Returns the information on the native operating system process in which the managed resource is running. If
* native support is not available or the process for some reason can no longer be found, this may return <code>
* null</code>.
+ *
+ * The returned {@link ProcessInfo} always has a fresh snapshot of non static data: it's whether newly created
+ * or got refreshed in order to determine if the process was still running.
*
* @return information on the resource's process
*/
@@ -350,9 +353,9 @@ public class ResourceContext<T extends ResourceComponent<?>> {
details = this.resourceDiscoveryComponent.discoverResources(context);
}
-
+
trackedProcesses.update(details);
- processInfo = trackedProcesses.getProcessInfo(resourceKey);
+ processInfo = trackedProcesses.getProcessInfo(resourceKey);
} catch (Exception e) {
LOG.warn("Cannot get native process for resource [" + this.resourceKey + "] - discovery failed", e);
}
@@ -366,22 +369,8 @@ public class ResourceContext<T extends ResourceComponent<?>> {
return processInfo;
}
- /**
- * @param processInfo
- * @return
- */
private boolean isRediscoveryRequired(ProcessInfo processInfo) {
- boolean rediscover = processInfo == null;
-
- if (!rediscover) {
- //if the process info thinks the process is running,
- //refresh it to check its facts again
- if (processInfo.isRunning()) {
- processInfo.refresh();
- }
- rediscover = !processInfo.isRunning();
- }
- return rediscover;
+ return processInfo == null || !processInfo.freshSnapshot().isRunning();
}
/**
@@ -519,6 +508,7 @@ public class ResourceContext<T extends ResourceComponent<?>> {
/**
* @deprecated Use {@link AvailabilityContext#createAvailabilityCollectorRunnable(AvailabilityFacet, long)}
*/
+ @Deprecated
public AvailabilityCollectorRunnable createAvailabilityCollectorRunnable(AvailabilityFacet availChecker,
long interval) {
diff --git a/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java b/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
index 64ab1c0..53f7f0c 100644
--- a/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
+++ b/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
@@ -185,8 +185,7 @@ public class ApacheExecutionUtil {
OperationResult res = serverComponent.invokeOperation(operation, new Configuration());
LOG.debug("Invoked operation '" + operation + "' on " + resourceContext.getResourceKey() + " (waiting for "
- + desiredState + "), attempt " + i + ": "
- + res.getComplexResults().getMap().toString());
+ + desiredState + "), attempt " + i + ": " + res.getComplexResults().getMap().toString());
//wait for max 30s for the operation to "express" itself
int w = 0;
@@ -212,7 +211,11 @@ public class ApacheExecutionUtil {
++i;
- LOG.warn("Could not detect the httpd process after invoking the start operation but the operation didn't throw any exception. I will retry at most ten times and then fail loudly. This has been attempt no. "
+ LOG.warn("httpd process is in an unexpected state after invoking the '"
+ + operation
+ + "' operation on "
+ + resourceContext.getResourceKey()
+ + " but the operation didn't throw any exception. I will retry at most ten times and then fail loudly. This has been attempt no. "
+ i);
}
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java
index 5f22f83..efecc27 100644
--- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java
+++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java
@@ -54,6 +54,7 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility;
import org.rhq.core.system.ProcessExecution;
import org.rhq.core.system.ProcessExecutionResults;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot;
import org.rhq.core.system.SystemInfo;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.plugins.jmx.JMXServerComponent;
@@ -73,10 +74,14 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent
if (processInfo == null) {
return UNKNOWN;
- } else if (processInfo.isRunning()) {
- return UP;
} else {
- return DOWN;
+ // It is safe to read prior snapshot as getNativeProcess always return a fresh instance
+ ProcessInfoSnapshot processInfoSnaphot = processInfo.priorSnaphot();
+ if (processInfoSnaphot.isRunning()) {
+ return UP;
+ } else {
+ return DOWN;
+ }
}
}
diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java
index c3a590c..ef1c8c5 100644
--- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java
+++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java
@@ -33,7 +33,6 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementDataTrait;
import org.rhq.core.domain.measurement.MeasurementDefinition;
@@ -52,8 +51,6 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.system.ProcessInfo;
-import org.rhq.plugins.hadoop.calltime.HadoopEventAndCalltimeDelegate;
-import org.rhq.plugins.hadoop.calltime.JobSummary;
import org.rhq.plugins.jmx.JMXComponent;
import org.rhq.plugins.jmx.JMXServerComponent;
@@ -61,18 +58,18 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
JMXComponent<ResourceComponent<?>>, MeasurementFacet, OperationFacet, ConfigurationFacet {
private static final Log LOG = LogFactory.getLog(HadoopServerComponent.class);
-
+
public static final String LOG_EVENT_TYPE = "logEntry";
public static final String LOG_POLLING_INTERVAL_PROPERTY = "logPollingInterval";
-
+
private Map<String, Boolean> percentageMeasurements;
-
+
private HadoopServerConfigurationDelegate configurationDelegate;
-
+
private HadoopOperationsDelegate operationsDelegate;
private boolean eventsRegistered;
-
+
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void start(ResourceContext context) throws Exception {
@@ -84,10 +81,11 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
Set<MeasurementDefinition> measDefinitions = context.getResourceType().getMetricDefinitions();
percentageMeasurements = new HashMap<String, Boolean>(measDefinitions.size());
for (MeasurementDefinition measDefinition : measDefinitions) {
- percentageMeasurements.put(measDefinition.getName(), MeasurementUnits.PERCENTAGE.equals(measDefinition.getUnits()));
+ percentageMeasurements.put(measDefinition.getName(),
+ MeasurementUnits.PERCENTAGE.equals(measDefinition.getUnits()));
}
}
-
+
@Override
public void stop() {
EventContext events = getResourceContext().getEventContext();
@@ -98,7 +96,7 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
}
super.stop();
}
-
+
/**
* Return availability of this resource
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
@@ -106,15 +104,18 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
@Override
public AvailabilityType getAvailability() {
ProcessInfo process = getResourceContext().getNativeProcess();
-
- AvailabilityType ret = process == null ? AvailabilityType.DOWN : (process.isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN);
-
+
+ // It is safe to read prior snapshot as getNativeProcess always return a fresh instance
+ AvailabilityType ret = process == null ? AvailabilityType.DOWN
+ : (process.priorSnaphot().isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN);
+
EventContext events = getResourceContext().getEventContext();
if (events != null) {
if (ret == AvailabilityType.UP) {
if (!eventsRegistered) {
File logFile = determineLogFile();
- int interval = Integer.parseInt(getResourceContext().getPluginConfiguration().getSimpleValue(LOG_POLLING_INTERVAL_PROPERTY, "60"));
+ int interval = Integer.parseInt(getResourceContext().getPluginConfiguration().getSimpleValue(
+ LOG_POLLING_INTERVAL_PROPERTY, "60"));
events.registerEventPoller(createNewEventPoller(events, logFile), interval);
eventsRegistered = true;
}
@@ -124,7 +125,7 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
discardPoller();
}
}
-
+
return ret;
}
@@ -148,7 +149,7 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
handleMetric(report, request);
}
}
-
+
protected void handleMetric(MeasurementReport report, MeasurementScheduleRequest request) throws Exception {
String name = request.getName();
int delimIndex = name.lastIndexOf(':');
@@ -169,7 +170,7 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
} else {
report.addData(new MeasurementDataNumeric(request, value.doubleValue()));
}
-
+
} else {
report.addData(new MeasurementDataTrait(request, valueObject.toString()));
}
@@ -183,14 +184,14 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
LOG.error("Failed to obtain measurement [" + name + "]", e);
}
}
-
+
@Override
public Configuration loadResourceConfiguration() throws Exception {
return configurationDelegate.loadConfiguration();
}
@Override
- public void updateResourceConfiguration(ConfigurationUpdateReport report) {
+ public void updateResourceConfiguration(ConfigurationUpdateReport report) {
try {
Configuration updatedConfiguration = report.getConfiguration();
configurationDelegate.updateConfiguration(updatedConfiguration);
@@ -218,37 +219,38 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
}
return result;
}
-
+
protected EventPoller createNewEventPoller(EventContext eventContext, File logFile) {
- return new LogFileEventPoller(eventContext, LOG_EVENT_TYPE, logFile, new Log4JLogEntryProcessor(LOG_EVENT_TYPE, logFile));
+ return new LogFileEventPoller(eventContext, LOG_EVENT_TYPE, logFile, new Log4JLogEntryProcessor(LOG_EVENT_TYPE,
+ logFile));
}
-
+
protected void discardPoller() {
-
+
}
-
+
private File determineLogFile() {
String username = getResourceContext().getNativeProcess().getCredentialsName().getUser();
String hostname = getResourceContext().getSystemInformation().getHostname();
-
+
String serverType = getServerType();
-
+
String name = "hadoop-" + username + "-" + serverType + "-" + hostname + ".log";
-
+
return new File(new File(getHomeDir(), "logs"), name);
}
-
+
private String getServerType() {
String mainClass = getResourceContext().getPluginConfiguration().getSimpleValue("_mainClass");
int dot = mainClass.lastIndexOf('.');
String className = mainClass.substring(dot + 1);
-
+
return className.toLowerCase();
}
-
+
protected File getHomeDir() {
- File homeDir =
- new File(getResourceContext().getPluginConfiguration().getSimpleValue(HadoopServerDiscovery.HOME_DIR_PROPERTY));
+ File homeDir = new File(getResourceContext().getPluginConfiguration().getSimpleValue(
+ HadoopServerDiscovery.HOME_DIR_PROPERTY));
if (!homeDir.exists()) {
throw new IllegalArgumentException("The configured home directory of this Hadoop instance ("
@@ -266,5 +268,5 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
}
return homeDir;
- }
+ }
}
diff --git a/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java b/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java
index f1a16e4..9d7169e 100644
--- a/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java
+++ b/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java
@@ -178,7 +178,7 @@ public class MySqlComponent implements DatabaseComponent<ResourceComponent<?>>,
private AggregateProcessInfo findProcessInfo() {
AggregateProcessInfo result = null;
// is still running reuse
- if (aggregateProcessInfo != null && aggregateProcessInfo.isRunning()) {
+ if (aggregateProcessInfo != null && aggregateProcessInfo.freshSnapshot().isRunning()) {
result = aggregateProcessInfo;
} else {
long pid = findPID();
diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessComponent.java
index c85ec42..a53b678 100644
--- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessComponent.java
+++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessComponent.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -42,6 +42,7 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.system.AggregateProcessInfo;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot;
import org.rhq.core.system.SystemInfo;
import org.rhq.core.util.exception.ThrowableUtil;
@@ -97,7 +98,14 @@ public class ProcessComponent implements ResourceComponent, MeasurementFacet {
@Override
public AvailabilityType getAvailability() {
try {
- return getProcess().isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN;
+ // Get a fresh snapshot of the process
+ ProcessInfoSnapshot processInfoSnapshot = (this.process == null) ? null : this.process.freshSnapshot();
+ if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) {
+ this.process = getProcessForConfiguration();
+ // Safe to get prior snapshot here, we've just recreated the process info instance
+ processInfoSnapshot = (this.process == null) ? null : this.process.priorSnaphot();
+ }
+ return processInfoSnapshot.isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN;
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug("failed to get process info: " + ThrowableUtil.getAllMessages(e));
@@ -106,21 +114,6 @@ public class ProcessComponent implements ResourceComponent, MeasurementFacet {
}
}
- private ProcessInfo getProcess() throws Exception {
- if (this.process != null && this.process.isRunning()) {
- // Refresh existing ProcessInfo when underlying process is apparently running.
- // ProcessInfo may hold stale data.
- // SIGAR objects do not get updated when a process goes down.
- this.process.refresh();
- }
- if (this.process == null || !this.process.isRunning()) {
- // Create ProcessInfo for the first time or when the underlying process is no longer running.
- // When a process is no longer running we need to make a new PIQL or pid file discovery.
- this.process = getProcessForConfiguration();
- }
- return this.process;
- }
-
private ProcessInfo getProcessForConfiguration() throws Exception {
SystemInfo sysInfo = this.resourceContext.getSystemInformation();
return getProcessForConfiguration(this.type, this.pidFile, this.piql, this.fullProcessTree, sysInfo);
diff --git a/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java b/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java
index 3cbe5b2..ec518aa 100644
--- a/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java
+++ b/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,9 @@ import java.util.Set;
import net.augeas.Augeas;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
@@ -52,37 +55,62 @@ import org.rhq.core.pluginapi.util.ObjectUtil;
import org.rhq.core.system.AggregateProcessInfo;
import org.rhq.core.system.NetworkStats;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot;
+import org.rhq.core.util.exception.ThrowableUtil;
/**
* @author Greg Hinkle
*/
public class OpenSSHDComponent implements ResourceComponent, ConfigurationFacet, MeasurementFacet {
+ private static final Log log = LogFactory.getLog(OpenSSHDComponent.class);
+
private ResourceContext resourceContext;
private AggregateProcessInfo processInfo;
+ @Override
public void start(ResourceContext resourceContext) throws InvalidPluginConfigurationException, Exception {
this.resourceContext = resourceContext;
- getSSHDProcess();
+ this.processInfo = getSSHDProcess();
}
+ @Override
public void stop() {
}
+ @Override
public AvailabilityType getAvailability() {
- return (processInfo != null && processInfo.isRunning()) ? AvailabilityType.UP : AvailabilityType.DOWN;
+ try {
+ // Get a fresh snapshot of the process
+ ProcessInfoSnapshot processInfoSnapshot = (this.processInfo == null) ? null : this.processInfo
+ .freshSnapshot();
+ if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) {
+ this.processInfo = getSSHDProcess();
+ // Safe to get prior snapshot here, we've just recreated the process info instance
+ processInfoSnapshot = (this.processInfo == null) ? null : this.processInfo.priorSnaphot();
+ }
+ return (this.processInfo != null && processInfoSnapshot.isRunning()) ? AvailabilityType.UP
+ : AvailabilityType.DOWN;
+ } catch (Exception e) {
+ if (log.isDebugEnabled()) {
+ log.debug("failed to get availability: " + ThrowableUtil.getAllMessages(e));
+ }
+ return AvailabilityType.DOWN;
+ }
}
- private void getSSHDProcess() {
+ private AggregateProcessInfo getSSHDProcess() {
List<ProcessInfo> procs = resourceContext.getSystemInformation().getProcesses(
"process|basename|match=sshd,process|basename|nomatch|parent=sshd");
if (procs.size() == 1) {
- this.processInfo = procs.get(0).getAggregateProcessTree();
+ return procs.get(0).getAggregateProcessTree();
}
+ return null;
}
+ @Override
public Configuration loadResourceConfiguration() throws Exception {
Configuration pluginConfiguration = resourceContext.getPluginConfiguration();
ConfigurationDefinition resourceConfigurationDefinition = resourceContext.getResourceType()
@@ -172,8 +200,7 @@ public class OpenSSHDComponent implements ResourceComponent, ConfigurationFacet,
// This very hackish bit of code is to suport the list-of-maps standard with a single simple definition in the map
PropertyDefinitionList listDef = ((PropertyDefinitionList) p);
PropertyDefinitionMap mapDef = ((PropertyDefinitionMap) listDef.getMemberDefinition());
- PropertyDefinitionSimple simpleDef = (PropertyDefinitionSimple) mapDef.getPropertyDefinitions()
- .get(0);
+ PropertyDefinitionSimple simpleDef = (PropertyDefinitionSimple) mapDef.getPropertyDefinitions().get(0);
String name = simpleDef.getName();
List<String> allValues = new ArrayList<String>();
@@ -196,9 +223,11 @@ public class OpenSSHDComponent implements ResourceComponent, ConfigurationFacet,
return config;
}
+ @Override
public void updateResourceConfiguration(ConfigurationUpdateReport report) {
}
+ @Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
NetworkStats stats = resourceContext.getSystemInformation().getNetworkStats("localhost", 22);
processInfo.refresh();
commit d65b4e4ce17fe7ad97b8634971490395c2521261
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Jan 24 16:27:28 2013 +0100
refactoring: renaming class "ResourceResourceAgentView" to "ResourceAgentView"
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 28ca7ab..e67d697 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -65,7 +65,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configura
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigurationEditView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigurationHistoryListView;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceResourceAgentView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceAgentView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.CalltimeView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.ResourceAvailabilityView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules.ResourceSchedulesView;
@@ -384,7 +384,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
viewFactory = (!enabled) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new ResourceResourceAgentView(inventoryTab.extendLocatorId("AgentView"), resourceId);
+ return new ResourceAgentView(inventoryTab.extendLocatorId("AgentView"), resourceId);
}
};
updateSubTab(this.inventoryTab, this.inventoryAgent, true, enabled, viewFactory);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
new file mode 100644
index 0000000..5c91365
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
@@ -0,0 +1,216 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.form.fields.FormItem;
+import com.smartgwt.client.widgets.form.fields.FormItemIcon;
+import com.smartgwt.client.widgets.form.fields.HeaderItem;
+import com.smartgwt.client.widgets.form.fields.SpacerItem;
+import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+
+import org.rhq.core.domain.resource.Agent;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.RefreshableView;
+import org.rhq.enterprise.gui.coregui.client.admin.topology.AgentTableView;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
+
+/**
+ * The content pane for the Resource Inventory>Agent subtab.
+ *
+ * @author Simeon Pinder
+ */
+public class ResourceAgentView extends LocatableVLayout implements RefreshableView {
+
+ private int resourceId;
+ private LocatableDynamicForm form;
+ private StaticTextItem nameValue;
+ private StaticTextItem addressValue;
+ private StaticTextItem portValue;
+ private FormItemIcon agentStatusIcon;
+ private StaticTextItem lastAvailReportValue;
+ private StaticTextItem lastAvailPingValue;
+ private StaticTextItem endpointValue;
+ private StaticTextItem topologyViewItem;
+
+ private boolean loading = false; // will be true if loadData is currently waiting for responses
+
+ public ResourceAgentView(String locatorId, int resourceId) {
+ super(locatorId);
+
+ this.resourceId = resourceId;
+ }
+
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+
+ setLeft("10%");
+ setWidth("80%");
+
+ this.form = new LocatableDynamicForm(extendLocatorId("Agent_Info"));
+ final List<FormItem> formItems = createFormItems();
+ this.form.setItems(formItems.toArray(new FormItem[formItems.size()]));
+ loadData();
+ this.addMember(this.form);
+ }
+
+ @Override
+ public void refresh() {
+ loadData();
+ }
+
+ private List<FormItem> createFormItems() {
+ final List<FormItem> formItems = new ArrayList<FormItem>();
+ HeaderItem headerItem = new HeaderItem("header", MSG.view_inventory_summary_agent_title());
+ headerItem.setValue(MSG.view_inventory_summary_agent_title());
+ formItems.add(headerItem);
+ formItems.add(new SpacerItem());
+
+ // Name
+ nameValue = new StaticTextItem("name", MSG.common_title_name());
+ formItems.add(nameValue);
+
+ // Address
+ String address = "address";
+ addressValue = new StaticTextItem(address, MSG.common_title_address());
+ formItems.add(addressValue);
+
+ // Port
+ String port = "port";
+ portValue = new StaticTextItem(port, MSG.common_title_port());
+ formItems.add(portValue);
+
+ // Agent Status
+ agentStatusIcon = new FormItemIcon();
+ agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
+ StaticTextItem agentStatus = new StaticTextItem("agent-comm-status", MSG
+ .view_inventory_summary_agent_status_title());
+ agentStatus.setIcons(agentStatusIcon);
+ agentStatus.setWrapTitle(false);
+ formItems.add(agentStatus);
+
+ // Last Received Avail report
+ String lastAvailReport = "last-avail-report";
+ lastAvailReportValue = new StaticTextItem(lastAvailReport, MSG.view_inventory_summary_agent_last_title());
+ lastAvailReportValue.setWrapTitle(false);
+ formItems.add(lastAvailReportValue);
+
+ // Last Received Avail ping
+ lastAvailPingValue = new StaticTextItem("last-avail-ping", MSG.view_adminTopology_agent_lastAvailabilityPing());
+ lastAvailPingValue.setWrapTitle(false);
+ formItems.add(lastAvailPingValue);
+
+ // Full Endpoint
+ String fullEndpoint = "full-endpoint";
+ endpointValue = new StaticTextItem(fullEndpoint, MSG.view_inventory_summary_agent_fullEnpoint());
+ formItems.add(endpointValue);
+
+ // link to agent topology view
+ String topologyView = "topology-view";
+ topologyViewItem = new StaticTextItem("topology-view", MSG.view_admin_topology());
+ formItems.add(topologyViewItem);
+
+ return formItems;
+ }
+
+ private void loadData() {
+ if (loading) {
+ return; // we are already loading and waiting for data, no need to re-issue the same queries
+ }
+ loading = true;
+
+ GWTServiceLookup.getAgentService().getAgentForResource(this.resourceId, new AsyncCallback<Agent>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ loading = false;
+ //Permissions failure, generate message to that effect
+ for (Canvas child : form.getChildren()) {
+ child.destroy();
+ }
+
+ HeaderItem headerItem = new HeaderItem("header", MSG.view_inventory_summary_agent_title());
+ headerItem.setValue(MSG.view_inventory_summary_agent_title());
+ StaticTextItem permissionsMessage = new StaticTextItem("permissions", "permissionsFailure");
+ permissionsMessage.setShowTitle(false);
+ permissionsMessage.setValue(MSG.view_inventory_summary_agent_error3());
+ permissionsMessage.setWrap(false);
+ form.setFields(headerItem, new SpacerItem(), permissionsMessage);
+ form.markForRedraw();
+ }
+
+ @Override
+ public void onSuccess(Agent agent) {
+ GWTServiceLookup.getAgentService().pingAgentForResource(resourceId, new AsyncCallback<Boolean>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ loading = false;
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_inventory_summary_agent_error2() + " " + resourceId + ".", caught);
+ agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
+ form.markForRedraw();
+ }
+
+ @Override
+ public void onSuccess(Boolean isUp) {
+ loading = false;
+ //update icon with correct status
+ agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(isUp));
+ form.markForRedraw();
+ }
+ });
+ nameValue.setValue(agent.getName());
+ addressValue.setValue(agent.getAddress());
+ portValue.setValue(agent.getPort());
+ Long lastAvailReport = agent.getLastAvailabilityReport();
+ lastAvailReportValue.setValue((null != lastAvailReport) ? new Date(lastAvailReport) : MSG.common_val_none());
+ Long lastAvailPing = agent.getLastAvailabilityPing();
+ lastAvailPingValue.setValue((null != lastAvailPing) ? new Date(lastAvailPing) : MSG.common_val_none());
+ String remoteEndpoint = agent.getRemoteEndpoint();
+ if (remoteEndpoint != null) {
+ // some browsers (firefox in particular) won't wrap unless you put breaks in the string
+ // (EDIT: in FF 16 the wrapping works even without a space, so this could be possibly ommited)
+ remoteEndpoint = remoteEndpoint.replaceAll("&", " &");
+ } else {
+ remoteEndpoint = MSG.view_inventory_summary_agent_fullEnpoint_err1();
+ }
+ endpointValue.setValue(remoteEndpoint);
+
+ // make clickable link for agent topology view
+ String detailsUrl = "#" + AgentTableView.VIEW_PATH + "/" + agent.getId();
+ String formattedValue = StringUtility.escapeHtml(MSG.common_label_link());
+ String topologyViewItemText = SeleniumUtility.getLocatableHref(detailsUrl, formattedValue, null);
+ topologyViewItem.setValue(topologyViewItemText);
+
+ form.markForRedraw();
+ }
+ });
+ }
+
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java
deleted file mode 100644
index 478207e..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.form.fields.FormItem;
-import com.smartgwt.client.widgets.form.fields.FormItemIcon;
-import com.smartgwt.client.widgets.form.fields.HeaderItem;
-import com.smartgwt.client.widgets.form.fields.SpacerItem;
-import com.smartgwt.client.widgets.form.fields.StaticTextItem;
-
-import org.rhq.core.domain.resource.Agent;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.ImageManager;
-import org.rhq.enterprise.gui.coregui.client.RefreshableView;
-import org.rhq.enterprise.gui.coregui.client.admin.topology.AgentTableView;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
-
-/**
- * The content pane for the Resource Inventory>Agent subtab.
- *
- * @author Simeon Pinder
- */
-public class ResourceResourceAgentView extends LocatableVLayout implements RefreshableView {
-
- private int resourceId;
- private LocatableDynamicForm form;
- private StaticTextItem nameValue;
- private StaticTextItem addressValue;
- private StaticTextItem portValue;
- private FormItemIcon agentStatusIcon;
- private StaticTextItem lastAvailReportValue;
- private StaticTextItem lastAvailPingValue;
- private StaticTextItem endpointValue;
- private StaticTextItem topologyViewItem;
-
- private boolean loading = false; // will be true if loadData is currently waiting for responses
-
- public ResourceResourceAgentView(String locatorId, int resourceId) {
- super(locatorId);
-
- this.resourceId = resourceId;
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
-
- setLeft("10%");
- setWidth("80%");
-
- this.form = new LocatableDynamicForm(extendLocatorId("Agent_Info"));
- final List<FormItem> formItems = createFormItems();
- this.form.setItems(formItems.toArray(new FormItem[formItems.size()]));
- loadData();
- this.addMember(this.form);
- }
-
- @Override
- public void refresh() {
- loadData();
- }
-
- private List<FormItem> createFormItems() {
- final List<FormItem> formItems = new ArrayList<FormItem>();
- HeaderItem headerItem = new HeaderItem("header", MSG.view_inventory_summary_agent_title());
- headerItem.setValue(MSG.view_inventory_summary_agent_title());
- formItems.add(headerItem);
- formItems.add(new SpacerItem());
-
- // Name
- nameValue = new StaticTextItem("name", MSG.common_title_name());
- formItems.add(nameValue);
-
- // Address
- String address = "address";
- addressValue = new StaticTextItem(address, MSG.common_title_address());
- formItems.add(addressValue);
-
- // Port
- String port = "port";
- portValue = new StaticTextItem(port, MSG.common_title_port());
- formItems.add(portValue);
-
- // Agent Status
- agentStatusIcon = new FormItemIcon();
- agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
- StaticTextItem agentStatus = new StaticTextItem("agent-comm-status", MSG
- .view_inventory_summary_agent_status_title());
- agentStatus.setIcons(agentStatusIcon);
- agentStatus.setWrapTitle(false);
- formItems.add(agentStatus);
-
- // Last Received Avail report
- String lastAvailReport = "last-avail-report";
- lastAvailReportValue = new StaticTextItem(lastAvailReport, MSG.view_inventory_summary_agent_last_title());
- lastAvailReportValue.setWrapTitle(false);
- formItems.add(lastAvailReportValue);
-
- // Last Received Avail ping
- lastAvailPingValue = new StaticTextItem("last-avail-ping", MSG.view_adminTopology_agent_lastAvailabilityPing());
- lastAvailPingValue.setWrapTitle(false);
- formItems.add(lastAvailPingValue);
-
- // Full Endpoint
- String fullEndpoint = "full-endpoint";
- endpointValue = new StaticTextItem(fullEndpoint, MSG.view_inventory_summary_agent_fullEnpoint());
- formItems.add(endpointValue);
-
- // link to agent topology view
- String topologyView = "topology-view";
- topologyViewItem = new StaticTextItem("topology-view", MSG.view_admin_topology());
- formItems.add(topologyViewItem);
-
- return formItems;
- }
-
- private void loadData() {
- if (loading) {
- return; // we are already loading and waiting for data, no need to re-issue the same queries
- }
- loading = true;
-
- GWTServiceLookup.getAgentService().getAgentForResource(this.resourceId, new AsyncCallback<Agent>() {
- @Override
- public void onFailure(Throwable caught) {
- loading = false;
- //Permissions failure, generate message to that effect
- for (Canvas child : form.getChildren()) {
- child.destroy();
- }
-
- HeaderItem headerItem = new HeaderItem("header", MSG.view_inventory_summary_agent_title());
- headerItem.setValue(MSG.view_inventory_summary_agent_title());
- StaticTextItem permissionsMessage = new StaticTextItem("permissions", "permissionsFailure");
- permissionsMessage.setShowTitle(false);
- permissionsMessage.setValue(MSG.view_inventory_summary_agent_error3());
- permissionsMessage.setWrap(false);
- form.setFields(headerItem, new SpacerItem(), permissionsMessage);
- form.markForRedraw();
- }
-
- @Override
- public void onSuccess(Agent agent) {
- GWTServiceLookup.getAgentService().pingAgentForResource(resourceId, new AsyncCallback<Boolean>() {
- @Override
- public void onFailure(Throwable caught) {
- loading = false;
- CoreGUI.getErrorHandler().handleError(
- MSG.view_inventory_summary_agent_error2() + " " + resourceId + ".", caught);
- agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
- form.markForRedraw();
- }
-
- @Override
- public void onSuccess(Boolean isUp) {
- loading = false;
- //update icon with correct status
- agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(isUp));
- form.markForRedraw();
- }
- });
- nameValue.setValue(agent.getName());
- addressValue.setValue(agent.getAddress());
- portValue.setValue(agent.getPort());
- Long lastAvailReport = agent.getLastAvailabilityReport();
- lastAvailReportValue.setValue((null != lastAvailReport) ? new Date(lastAvailReport) : MSG.common_val_none());
- Long lastAvailPing = agent.getLastAvailabilityPing();
- lastAvailPingValue.setValue((null != lastAvailPing) ? new Date(lastAvailPing) : MSG.common_val_none());
- String remoteEndpoint = agent.getRemoteEndpoint();
- if (remoteEndpoint != null) {
- // some browsers (firefox in particular) won't wrap unless you put breaks in the string
- // (EDIT: in FF 16 the wrapping works even without a space, so this could be possibly ommited)
- remoteEndpoint = remoteEndpoint.replaceAll("&", " &");
- } else {
- remoteEndpoint = MSG.view_inventory_summary_agent_fullEnpoint_err1();
- }
- endpointValue.setValue(remoteEndpoint);
-
- // make clickable link for agent topology view
- String detailsUrl = "#" + AgentTableView.VIEW_PATH + "/" + agent.getId();
- String formattedValue = StringUtility.escapeHtml(MSG.common_label_link());
- String topologyViewItemText = SeleniumUtility.getLocatableHref(detailsUrl, formattedValue, null);
- topologyViewItem.setValue(topologyViewItemText);
-
- form.markForRedraw();
- }
- });
- }
-
-}
\ No newline at end of file
commit 875acb2dde6de2de0e5dee792ed437ace1252271
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Jan 24 14:47:15 2013 +0100
Adding "Last Availability Ping" to the agent detail page in topology section and to the agent detail page in Inventory->Agent tab
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
index f8de3a6..0b13a1b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
@@ -23,6 +23,7 @@ import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasour
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP_ID;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AGENTTOKEN;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_ID;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_LAST_AVAILABILITY_PING;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_LAST_AVAILABILITY_REPORT;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_NAME;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_PORT;
@@ -101,9 +102,12 @@ public class AgentDatasource extends RPCDataSource<Agent, AgentCriteria> {
fields.add(serverIdField);
fields.add(FIELD_PORT.getListGridField("90"));
- ListGridField lastAvailabilityReportField = FIELD_LAST_AVAILABILITY_REPORT.getListGridField("120");
+ ListGridField lastAvailabilityReportField = FIELD_LAST_AVAILABILITY_REPORT.getListGridField("125");
TimestampCellFormatter.prepareDateField(lastAvailabilityReportField);
fields.add(lastAvailabilityReportField);
+ ListGridField lastAvailabilityPingField = FIELD_LAST_AVAILABILITY_PING.getListGridField("125");
+ TimestampCellFormatter.prepareDateField(lastAvailabilityPingField);
+ fields.add(lastAvailabilityPingField);
if (!isAffinityGroupId) {
fields.add(FIELD_AFFINITY_GROUP.getListGridField("100"));
@@ -155,6 +159,7 @@ public class AgentDatasource extends RPCDataSource<Agent, AgentCriteria> {
record.setAttribute(FIELD_SERVER.propertyName(), from.getServer() == null ? "" : from.getServer().getName());
record.setAttribute(FIELD_SERVER_ID.propertyName(), from.getServer() == null ? "" : from.getServer().getId());
record.setAttribute(FIELD_LAST_AVAILABILITY_REPORT.propertyName(), from.getLastAvailabilityReport());
+ record.setAttribute(FIELD_LAST_AVAILABILITY_PING.propertyName(), from.getLastAvailabilityPing());
record.setAttribute(FIELD_AFFINITY_GROUP.propertyName(), from.getAffinityGroup() == null ? "" : from
.getAffinityGroup().getName());
record.setAttribute(FIELD_AFFINITY_GROUP_ID.propertyName(), from.getAffinityGroup() == null ? "" : from
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java
index cd736aa..132ee74 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java
@@ -46,6 +46,9 @@ public enum AgentDatasourceField {
FIELD_LAST_AVAILABILITY_REPORT("lastAvailabilityReport", CoreGUI.getMessages()
.view_adminTopology_agent_lastAvailabilityReport()),
+
+ FIELD_LAST_AVAILABILITY_PING("lastAvailabilityPing", CoreGUI.getMessages()
+ .view_adminTopology_agent_lastAvailabilityPing()),
FIELD_AGENT_TOKEN("agentToken", CoreGUI.getMessages().view_adminTopology_agentDetail_token()),
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
index b05a751..50210b5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
@@ -22,6 +22,7 @@ package org.rhq.enterprise.gui.coregui.client.admin.topology;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_ADDRESS;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AGENT_TOKEN;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_LAST_AVAILABILITY_PING;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_LAST_AVAILABILITY_REPORT;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_NAME;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_PORT;
@@ -177,11 +178,17 @@ public class AgentDetailView extends LocatableVLayout {
final StaticTextItem tokenItem = new StaticTextItem(FIELD_AGENT_TOKEN.propertyName(), FIELD_AGENT_TOKEN.title());
tokenItem.setValue(agent.getAgentToken());
- StaticTextItem lastAvailabilityItem = new StaticTextItem(FIELD_LAST_AVAILABILITY_REPORT.propertyName(),
+ StaticTextItem lastAvailabilityReportItem = new StaticTextItem(FIELD_LAST_AVAILABILITY_REPORT.propertyName(),
FIELD_LAST_AVAILABILITY_REPORT.title());
String lastReport = agent.getLastAvailabilityReport() == null ? "unknown" : TimestampCellFormatter.format(
Long.valueOf(agent.getLastAvailabilityReport()), TimestampCellFormatter.DATE_TIME_FORMAT_LONG);
- lastAvailabilityItem.setValue(lastReport);
+ lastAvailabilityReportItem.setValue(lastReport);
+
+ StaticTextItem lastAvailabilityPingItem = new StaticTextItem(FIELD_LAST_AVAILABILITY_PING.propertyName(),
+ FIELD_LAST_AVAILABILITY_PING.title());
+ String lastPing = agent.getLastAvailabilityPing() == null ? "unknown" : TimestampCellFormatter.format(
+ Long.valueOf(agent.getLastAvailabilityPing()), TimestampCellFormatter.DATE_TIME_FORMAT_LONG);
+ lastAvailabilityPingItem.setValue(lastPing);
// make clickable link for affinity group
StaticTextItem affinityGroupItem = new StaticTextItem(FIELD_AFFINITY_GROUP.propertyName(),
@@ -206,8 +213,8 @@ public class AgentDetailView extends LocatableVLayout {
}
currentServerItem.setValue(serverValue);
- form.setItems(nameItem, addressItem, remoteEndpointItem, portItem, tokenItem, lastAvailabilityItem,
- affinityGroupItem, currentServerItem);
+ form.setItems(nameItem, addressItem, remoteEndpointItem, portItem, tokenItem, lastAvailabilityReportItem,
+ lastAvailabilityPingItem, affinityGroupItem, currentServerItem);
SectionStackSection section = new SectionStackSection(MSG.common_title_details());
section.setExpanded(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java
index ff1addc..478207e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java
@@ -34,9 +34,12 @@ import org.rhq.core.domain.resource.Agent;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.RefreshableView;
+import org.rhq.enterprise.gui.coregui.client.admin.topology.AgentTableView;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* The content pane for the Resource Inventory>Agent subtab.
@@ -52,7 +55,9 @@ public class ResourceResourceAgentView extends LocatableVLayout implements Refre
private StaticTextItem portValue;
private FormItemIcon agentStatusIcon;
private StaticTextItem lastAvailReportValue;
+ private StaticTextItem lastAvailPingValue;
private StaticTextItem endpointValue;
+ private StaticTextItem topologyViewItem;
private boolean loading = false; // will be true if loadData is currently waiting for responses
@@ -116,11 +121,21 @@ public class ResourceResourceAgentView extends LocatableVLayout implements Refre
lastAvailReportValue = new StaticTextItem(lastAvailReport, MSG.view_inventory_summary_agent_last_title());
lastAvailReportValue.setWrapTitle(false);
formItems.add(lastAvailReportValue);
+
+ // Last Received Avail ping
+ lastAvailPingValue = new StaticTextItem("last-avail-ping", MSG.view_adminTopology_agent_lastAvailabilityPing());
+ lastAvailPingValue.setWrapTitle(false);
+ formItems.add(lastAvailPingValue);
// Full Endpoint
String fullEndpoint = "full-endpoint";
endpointValue = new StaticTextItem(fullEndpoint, MSG.view_inventory_summary_agent_fullEnpoint());
formItems.add(endpointValue);
+
+ // link to agent topology view
+ String topologyView = "topology-view";
+ topologyViewItem = new StaticTextItem("topology-view", MSG.view_admin_topology());
+ formItems.add(topologyViewItem);
return formItems;
}
@@ -170,20 +185,28 @@ public class ResourceResourceAgentView extends LocatableVLayout implements Refre
form.markForRedraw();
}
});
-
nameValue.setValue(agent.getName());
addressValue.setValue(agent.getAddress());
portValue.setValue(agent.getPort());
- Long lastAvail = agent.getLastAvailabilityReport();
- lastAvailReportValue.setValue((null != lastAvail) ? new Date(lastAvail) : MSG.common_val_none());
+ Long lastAvailReport = agent.getLastAvailabilityReport();
+ lastAvailReportValue.setValue((null != lastAvailReport) ? new Date(lastAvailReport) : MSG.common_val_none());
+ Long lastAvailPing = agent.getLastAvailabilityPing();
+ lastAvailPingValue.setValue((null != lastAvailPing) ? new Date(lastAvailPing) : MSG.common_val_none());
String remoteEndpoint = agent.getRemoteEndpoint();
if (remoteEndpoint != null) {
// some browsers (firefox in particular) won't wrap unless you put breaks in the string
+ // (EDIT: in FF 16 the wrapping works even without a space, so this could be possibly ommited)
remoteEndpoint = remoteEndpoint.replaceAll("&", " &");
} else {
remoteEndpoint = MSG.view_inventory_summary_agent_fullEnpoint_err1();
}
endpointValue.setValue(remoteEndpoint);
+
+ // make clickable link for agent topology view
+ String detailsUrl = "#" + AgentTableView.VIEW_PATH + "/" + agent.getId();
+ String formattedValue = StringUtility.escapeHtml(MSG.common_label_link());
+ String topologyViewItemText = SeleniumUtility.getLocatableHref(detailsUrl, formattedValue, null);
+ topologyViewItem.setValue(topologyViewItemText);
form.markForRedraw();
}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 2068272..4c29ae3 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -551,6 +551,7 @@ view_adminTopology_agent_agentBindAddress = Agent Bind Address
view_adminTopology_agent_agentBindPort = Agent Bind Port
view_adminTopology_agent_agentName = Agent Name
view_adminTopology_agent_connectedServer = Connected Server
+view_adminTopology_agent_lastAvailabilityPing = Last Availability Ping
view_adminTopology_agent_lastAvailabilityReport = Last Availability Report
view_adminTopology_agents = Agents
view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number does not correspond to the number of currently connected agents.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 004a414..9fa7b83 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -517,6 +517,7 @@ view_adminTopology_affinityGroups = Affinitätsgruppen
##view_adminTopology_agent_agentBindPort = Agent Bind Port
##view_adminTopology_agent_agentName = Agent Name
##view_adminTopology_agent_connectedServer = Connected Server
+##view_adminTopology_agent_lastAvailabilityPing = Last Availability Ping
##view_adminTopology_agent_lastAvailabilityReport = Last Availability Report
view_adminTopology_agents = Agenten
##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 411fb71..404736b 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -549,6 +549,7 @@ view_adminTopology_affinityGroups = アフィニティグループ
##view_adminTopology_agent_agentBindPort = Agent Bind Port
##view_adminTopology_agent_agentName = Agent Name
##view_adminTopology_agent_connectedServer = Connected Server
+##view_adminTopology_agent_lastAvailabilityPing = Last Availability Ping
##view_adminTopology_agent_lastAvailabilityReport = Last Availability Report
view_adminTopology_agents = エージェント
##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
index 29b0ba7..f358bc7 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
@@ -455,9 +455,95 @@ view_adminTemplates_prompt_disabledMetricTemplates = 이 자원 유형에 대해
view_adminTemplates_prompt_enabledMetricTemplates = 이 자원 유형에 대해 기본적으로 활성화된 통계 일정 수
view_adminTemplates_servers = 서버
view_adminTopology_affinityGroups = 선호도 그룹
+##view_adminTopology_affinityGroups_agentCount = Agent Count
+##view_adminTopology_affinityGroups_agentsInThisGroup = Agents in This Group
+##view_adminTopology_affinityGroups_agentsNotPartOfAnAffinityGroup = Agents not Part of an Affinity Group
+##view_adminTopology_affinityGroups_agetnMembers = Agent Members
+##view_adminTopology_affinityGroups_createNew = Create New
+##view_adminTopology_affinityGroups_details = Affinity Group Details
+##view_adminTopology_affinityGroups_removeSelected = Remove Selected
+##view_adminTopology_affinityGroups_serverCount = Server Count
+##view_adminTopology_affinityGroups_serverMembers = Server Members
+##view_adminTopology_agentDetail_address = Address
+##view_adminTopology_agentDetail_agentFailoverList = Agent Failover List
+##view_adminTopology_agentDetail_currentServer = Current Server
+##view_adminTopology_agentDetail_token = Token
+##view_adminTopology_agent_agentBindAddress = Agent Bind Address
+##view_adminTopology_agent_agentBindPort = Agent Bind Port
+##view_adminTopology_agent_agentName = Agent Name
+##view_adminTopology_agent_connectedServer = Connected Server
+##view_adminTopology_agent_lastAvailabilityPing = Last Availability Ping
+##view_adminTopology_agent_lastAvailabilityReport = Last Availability Report
view_adminTopology_agents = 에이전트
+##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
+##view_adminTopology_message_agroupAssingAgentsFail = Unable to assign agents to the affinity group with id {0}.
+##view_adminTopology_message_agroupAssingServersFail = Unable to assign servers to the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingAgentsFail = Unable to remove agents from the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingServersFail = Unable to remove servers from the affinity group with id {0}.
+##view_adminTopology_message_agroupRenamed = Affinity group with id {0} and name {1} was renamed to {2}.
+##view_adminTopology_message_agroupRenamingFail = Unable to rename affinity group with id {0} and name {1}.
+##view_adminTopology_message_fetchAgentFail = Unable to fetch agent details for agent with id {0}.
+##view_adminTopology_message_fetchAgents2Fail = Unable to fetch agents.
+##view_adminTopology_message_fetchAgentsFail = Unable to fetch agent(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchAgroupFail = Unable to fetch affinity group details for group with id {0}.
+##view_adminTopology_message_fetchAgroupsFail = Unable to fetch affinity group(s).
+##view_adminTopology_message_fetchFailOverLists = Unable to fetch fail over list details.
+##view_adminTopology_message_fetchPEventDetailsFail = Unable to fetch partition event details for event with id {0}.
+##view_adminTopology_message_fetchPEventFail = Unable to fetch partition events.
+##view_adminTopology_message_fetchServerFail = Unable to fetch server details for server with id {0}.
+##view_adminTopology_message_fetchServers2Fail = Unable to fetch servers.
+##view_adminTopology_message_fetchServersFail = Unable to fetch server(s) for affinity group with id {0}.
+##view_adminTopology_message_forceRepartition = Do you really want to force a repartition of whole cluster? It will force all the agents to connect to its most preferred server.
+##view_adminTopology_message_forceRepartitionFail = Unable to run repartition.
+##view_adminTopology_message_order = Order
+##view_adminTopology_message_removeAGroupsConfirm = Do you really want to remove following affinity groups {0}?
+##view_adminTopology_message_removeAGroupsFail = Unable to remove following affinity groups(s) {0}.
+##view_adminTopology_message_removeAllPEventConfirm = Do you really want to purge all partition events?
+##view_adminTopology_message_removePEventConfirm = Do you really want to remove following partition events {0}?
+##view_adminTopology_message_removePEventFail = Unable to remove {0} partition events(s).
+##view_adminTopology_message_removeServerConfirm = Do you really want to remove servers {0}?
+##view_adminTopology_message_removeServerFail = Unable to remove {0} server(s).
+##view_adminTopology_message_removedAGroups = Removed {0} affinity group(s).
+##view_adminTopology_message_removedAllPEvent = All partition events have been purged.
+##view_adminTopology_message_removedAllPEventFail = Unable to purge all partition events.
+##view_adminTopology_message_removedPEvent = Removed {0} partition events(s).
+##view_adminTopology_message_removedServer = Removed {0} server(s).
+##view_adminTopology_message_repartitioned = The cluster repartitioning was successfully invoked.
+##view_adminTopology_message_serverUpdateFail = Unable to update server {0}.
+##view_adminTopology_message_serverUpdated = The server {0} was successfully updated.
+##view_adminTopology_message_setMode = Set {0} server(s) to {1} mode.
+##view_adminTopology_message_setModeConfirm = Do you really want to set servers {0} to {1} mode?
+##view_adminTopology_message_setModeFail = Unable to set {0} server(s) to {1} mode.
view_adminTopology_partitionEvents = 이벤트 범주
+##view_adminTopology_partitionEventsDetail_agentAssignments = Agent Assignments
+##view_adminTopology_partitionEventsDetail_agentAssignments_nothing = No agents were reassigned as a result of this partition event
+##view_adminTopology_partitionEventsDetail_eventDetails = Event Details
+##view_adminTopology_partitionEventsDetail_eventExecutionTime = Event Execution Time
+##view_adminTopology_partitionEventsDetail_eventType = Event Type
+##view_adminTopology_partitionEvents_details = Details
+##view_adminTopology_partitionEvents_detailsFilter = Details Filter
+##view_adminTopology_partitionEvents_execStatusFilter = Execution Status Filter
+##view_adminTopology_partitionEvents_execTime = Execution Time
+##view_adminTopology_partitionEvents_executionStatus = Execution Status
+##view_adminTopology_partitionEvents_forceRepartition = Force Repartition
+##view_adminTopology_partitionEvents_initiatedBy = Initiated By
+##view_adminTopology_partitionEvents_purgeAll = Purge All
+##view_adminTopology_partitionEvents_type = Type
+##view_adminTopology_partitionEvents_typeFilter = Type Filter
view_adminTopology_remoteAgentInstall = 원격 에이전트 설치
+##view_adminTopology_serverDetail_connectedAgents = Connected Agents
+##view_adminTopology_serverDetail_installationDate = Installation Date
+##view_adminTopology_serverDetail_operationMode = Operation Mode
+##view_adminTopology_server_affinityGroup = Affinity Group
+##view_adminTopology_server_agentCount = Agent Count
+##view_adminTopology_server_endpointAddress = Endpoint Address
+##view_adminTopology_server_lastUpdateTime = Last Update Time
+##view_adminTopology_server_mode = Mode
+##view_adminTopology_server_nonSecurePort = Nonsecure Port
+##view_adminTopology_server_removeSelected = Remove Selected
+##view_adminTopology_server_securePort = Secure Port
+##view_adminTopology_server_setMaintenance = Set Maintenance
+##view_adminTopology_server_setNormal = Set Normal
view_adminTopology_servers = 서버
view_adminUsersDetails_dataTypeName = 사용자
view_adminUsers_failCreateUserWithExistingName = 기존 이름 [{0}]과 사용자를 만들지 못했습니다. 다른 이름을 사용하십시오.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 9699756..f5121ae 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -554,6 +554,7 @@ view_adminTopology_affinityGroups = Grupos de Afinidade
##view_adminTopology_agent_agentBindPort = Agent Bind Port
##view_adminTopology_agent_agentName = Agent Name
##view_adminTopology_agent_connectedServer = Connected Server
+##view_adminTopology_agent_lastAvailabilityPing = Last Availability Ping
##view_adminTopology_agent_lastAvailabilityReport = Last Availability Report
view_adminTopology_agents = Agentes
##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index 0d56ebc..d4ec501 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -516,10 +516,97 @@
#view_adminTemplates_servers = Servers
#view_adminTemplates_userTemplates = User Templates
#view_adminTopology_affinityGroups = Affinity Groups
+##view_adminTopology_affinityGroups_agentCount = Agent Count
+##view_adminTopology_affinityGroups_agentsInThisGroup = Agents in This Group
+##view_adminTopology_affinityGroups_agentsNotPartOfAnAffinityGroup = Agents not Part of an Affinity Group
+##view_adminTopology_affinityGroups_agetnMembers = Agent Members
+##view_adminTopology_affinityGroups_createNew = Create New
+##view_adminTopology_affinityGroups_details = Affinity Group Details
+##view_adminTopology_affinityGroups_removeSelected = Remove Selected
+##view_adminTopology_affinityGroups_serverCount = Server Count
+##view_adminTopology_affinityGroups_serverMembers = Server Members
+##view_adminTopology_agentDetail_address = Address
+##view_adminTopology_agentDetail_agentFailoverList = Agent Failover List
+##view_adminTopology_agentDetail_currentServer = Current Server
+##view_adminTopology_agentDetail_remoteEndpoint = Remote Endpoint
+##view_adminTopology_agentDetail_token = Token
+##view_adminTopology_agent_agentBindAddress = Agent Bind Address
+##view_adminTopology_agent_agentBindPort = Agent Bind Port
+##view_adminTopology_agent_agentName = Agent Name
+##view_adminTopology_agent_connectedServer = Connected Server
+##view_adminTopology_agent_lastAvailabilityPing = Last Availability Ping
+##view_adminTopology_agent_lastAvailabilityReport = Last Availability Report
#view_adminTopology_agents = Agents
+##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
+##view_adminTopology_message_agroupAssingAgentsFail = Unable to assign agents to the affinity group with id {0}.
+##view_adminTopology_message_agroupAssingServersFail = Unable to assign servers to the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingAgentsFail = Unable to remove agents from the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingServersFail = Unable to remove servers from the affinity group with id {0}.
+##view_adminTopology_message_agroupRenamed = Affinity group with id {0} and name {1} was renamed to {2}.
+##view_adminTopology_message_agroupRenamingFail = Unable to rename affinity group with id {0} and name {1}.
+##view_adminTopology_message_fetchAgentFail = Unable to fetch agent details for agent with id {0}.
+##view_adminTopology_message_fetchAgents2Fail = Unable to fetch agents.
+##view_adminTopology_message_fetchAgentsFail = Unable to fetch agent(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchAgroupFail = Unable to fetch affinity group details for group with id {0}.
+##view_adminTopology_message_fetchAgroupsFail = Unable to fetch affinity group(s).
+##view_adminTopology_message_fetchFailOverLists = Unable to fetch fail over list details.
+##view_adminTopology_message_fetchPEventDetailsFail = Unable to fetch partition event details for event with id {0}.
+##view_adminTopology_message_fetchPEventFail = Unable to fetch partition events.
+##view_adminTopology_message_fetchServerFail = Unable to fetch server details for server with id {0}.
+##view_adminTopology_message_fetchServers2Fail = Unable to fetch servers.
+##view_adminTopology_message_fetchServersFail = Unable to fetch server(s) for affinity group with id {0}.
+##view_adminTopology_message_forceRepartition = Do you really want to force a repartition of whole cluster? It will force all the agents to connect to its most preferred server.
+##view_adminTopology_message_forceRepartitionFail = Unable to run repartition.
+##view_adminTopology_message_order = Order
+##view_adminTopology_message_removeAGroupsConfirm = Do you really want to remove following affinity groups {0}?
+##view_adminTopology_message_removeAGroupsFail = Unable to remove following affinity groups(s) {0}.
+##view_adminTopology_message_removeAllPEventConfirm = Do you really want to purge all partition events?
+##view_adminTopology_message_removePEventConfirm = Do you really want to remove following partition events {0}?
+##view_adminTopology_message_removePEventFail = Unable to remove {0} partition events(s).
+##view_adminTopology_message_removeServerConfirm = Do you really want to remove servers {0}?
+##view_adminTopology_message_removeServerFail = Unable to remove {0} server(s).
+##view_adminTopology_message_removedAGroups = Removed {0} affinity group(s).
+##view_adminTopology_message_removedAllPEvent = All partition events have been purged.
+##view_adminTopology_message_removedAllPEventFail = Unable to purge all partition events.
+##view_adminTopology_message_removedPEvent = Removed {0} partition events(s).
+##view_adminTopology_message_removedServer = Removed {0} server(s).
+##view_adminTopology_message_repartitioned = The cluster repartitioning was successfully invoked.
+##view_adminTopology_message_serverUpdateFail = Unable to update server {0}.
+##view_adminTopology_message_serverUpdated = The server {0} was successfully updated.
+##view_adminTopology_message_setMode = Set {0} server(s) to {1} mode.
+##view_adminTopology_message_setModeConfirm = Do you really want to set servers {0} to {1} mode?
+##view_adminTopology_message_setModeFail = Unable to set {0} server(s) to {1} mode.
#view_adminTopology_partitionEvents = Partition Events
+##view_adminTopology_partitionEventsDetail_agentAssignments = Agent Assignments
+##view_adminTopology_partitionEventsDetail_agentAssignments_nothing = No agents were reassigned as a result of this partition event
+##view_adminTopology_partitionEventsDetail_eventDetails = Event Details
+##view_adminTopology_partitionEventsDetail_eventExecutionTime = Event Execution Time
+##view_adminTopology_partitionEventsDetail_eventType = Event Type
+##view_adminTopology_partitionEvents_details = Details
+##view_adminTopology_partitionEvents_detailsFilter = Details Filter
+##view_adminTopology_partitionEvents_execStatusFilter = Execution Status Filter
+##view_adminTopology_partitionEvents_execTime = Execution Time
+##view_adminTopology_partitionEvents_executionStatus = Execution Status
+##view_adminTopology_partitionEvents_forceRepartition = Force Repartition
+##view_adminTopology_partitionEvents_initiatedBy = Initiated By
+##view_adminTopology_partitionEvents_purgeAll = Purge All
+##view_adminTopology_partitionEvents_type = Type
+##view_adminTopology_partitionEvents_typeFilter = Type Filter
#view_adminTopology_remoteAgentInstall = Remote Agent Install
#view_adminTopology_servers = Servers
+##view_adminTopology_serverDetail_connectedAgents = Connected Agents
+##view_adminTopology_serverDetail_installationDate = Installation Date
+##view_adminTopology_serverDetail_operationMode = Operation Mode
+##view_adminTopology_server_affinityGroup = Affinity Group
+##view_adminTopology_server_agentCount = Agent Count
+##view_adminTopology_server_endpointAddress = Endpoint Address
+##view_adminTopology_server_lastUpdateTime = Last Update Time
+##view_adminTopology_server_mode = Mode
+##view_adminTopology_server_nonSecurePort = Nonsecure Port
+##view_adminTopology_server_removeSelected = Remove Selected
+##view_adminTopology_server_securePort = Secure Port
+##view_adminTopology_server_setMaintenance = Set Maintenance
+##view_adminTopology_server_setNormal = Set Normal
#view_adminUsersDetails_dataTypeName = user
#view_admin_administration = Administration
#view_admin_configuration = Configuration
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index f6abf6b..40a8517 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -541,6 +541,7 @@ view_adminTopology_affinityGroups = \u76f8\u5173\u7ec4
##view_adminTopology_agent_agentBindPort = Agent Bind Port
##view_adminTopology_agent_agentName = Agent Name
##view_adminTopology_agent_connectedServer = Connected Server
+##view_adminTopology_agent_lastAvailabilityPing = Last Availability Ping
##view_adminTopology_agent_lastAvailabilityReport = Last Availability Report
view_adminTopology_agents = \u4ee3\u7406
##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
1
0
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 57 ++++------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java | 2
2 files changed, 29 insertions(+), 30 deletions(-)
New commits:
commit 807c358a4048bd47973177d63caa62197d1db6b9
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Jan 25 10:50:04 2013 -0500
Perf enhancement to mergeInventoryReport, replace Criteria calls with local
named Query use because it ended up just being an ID search with no optional
data.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index a29d0c4..67bd1fa 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -37,13 +37,13 @@ import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
import javax.security.auth.login.LoginException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jetbrains.annotations.NotNull;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.Scheduler;
@@ -463,7 +463,6 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
return result;
}
- @NotNull
public MergeResourceResponse manuallyAddResource(Subject user, ResourceType resourceType, int parentResourceId,
Configuration pluginConfiguration) throws InvalidPluginConfigurationClientException, PluginContainerException {
if (!this.authorizationManager.hasResourcePermission(user, Permission.CREATE_CHILD_RESOURCES, parentResourceId)) {
@@ -625,13 +624,13 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
}
/**
- * @param resource
+ * @param resource NotNull
* @param upgradeRequest
* @param allowGenericPropertiesUpgrade name and description are only upgraded if this is true
* @return response to the upgrade request detailing what has been accepted on the server side
*/
- private ResourceUpgradeResponse upgradeResource(@NotNull
- Resource resource, ResourceUpgradeRequest upgradeRequest, boolean allowGenericPropertiesUpgrade) {
+ private ResourceUpgradeResponse upgradeResource(Resource resource, ResourceUpgradeRequest upgradeRequest,
+ boolean allowGenericPropertiesUpgrade) {
if (upgradeRequest.getUpgradeErrorMessage() != null) {
ResourceError error = new ResourceError(resource, ResourceErrorType.UPGRADE,
upgradeRequest.getUpgradeErrorMessage(), upgradeRequest.getUpgradeErrorStackTrace(),
@@ -727,16 +726,12 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
* <p>Does not require an existing transaction. The resource and each child will be merged in an isolated
* transaction</p>
*
- * @param resource pojo, the resource to be merged, should have parent and children pojos set
- * @param agent detached entity, the agent that should be set on the resource being merged
+ * @param resource NotNull pojo, the resource to be merged, should have parent and children pojos set
+ * @param agent NotNull detached entity, the agent that should be set on the resource being merged
*
* @throws InvalidInventoryReportException if a critical field in the resource is missing or invalid
*/
- private void mergeResource( //
- @NotNull
- Resource resource, //
- @NotNull
- Agent agent) throws InvalidInventoryReportException {
+ private void mergeResource(Resource resource, Agent agent) throws InvalidInventoryReportException {
long start = System.currentTimeMillis();
@@ -852,6 +847,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
log.debug("getExistingResource processing for [" + resource + "]");
}
+ // We perform this query a lot during a large inventory merge, so minimize overhead by using it directly
+ Query query = entityManager.createNamedQuery(Resource.QUERY_FIND_BY_ID);
Resource existingResource = null;
Subject overlord = subjectManager.getOverlord();
@@ -860,17 +857,15 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
log.debug("Agent claims resource is already in inventory. Id=" + resource.getId());
}
- ResourceCriteria criteria = new ResourceCriteria();
- criteria.addFilterId(resource.getId());
- criteria.addFilterInventoryStatus(null); // Don't filter on COMMITTED, disable the default filter
- List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria);
- if (!result.isEmpty()) {
+ try {
+ query.setParameter("resourceId", resource.getId());
+ existingResource = (Resource) query.getSingleResult();
if (log.isDebugEnabled()) {
log.debug("Found resource already in inventory. Id=" + resource.getId());
}
- existingResource = result.get(0);
+ } catch (NoResultException e) {
+ existingResource = null;
- } else {
// agent lied - agent's copy of JON server inventory must be stale.
if (log.isDebugEnabled()) {
log.debug("However, no resource exists with the specified id. Id=" + resource.getId());
@@ -898,22 +893,26 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
while (null != parent && null == existingResource) {
parent = parent.getParentResource();
- //check if the parent is in inventory. This might not be the case during initial sync-up for resource upgrade.
+ // check if the parent is in inventory. This might not be the case during initial sync-up for resource upgrade.
Resource existingParent = null;
if (null != parent) {
- ResourceCriteria criteria = new ResourceCriteria();
- criteria.addFilterId(parent.getId());
- criteria.addFilterInventoryStatus(null); // Don't filter on COMMITTED, disable the default filter
- List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria);
- if (result.isEmpty()) {
- //well, this parent is not known to the server, so there's no point in trying to find a child of it...
- continue;
+ if (parent.getId() <= 0) {
+ log.warn("Expected potential parent resource to have a valid ID. Parent=" + parent + ", Child="
+ + resource);
+ }
+
+ try {
+ query.setParameter("resourceId", parent.getId());
+ existingParent = (Resource) query.getSingleResult();
- } else {
- existingParent = result.get(0);
+ } catch (NoResultException e) {
+ // this parent is not known to the server, so there's no point in trying to find a child of it...
+ continue;
}
}
+ // We found the parent in inventory, so now see if we can find this resource in inventory by using
+ // the parent, the resource key (unique among siblings), the plugin and the type.
existingResource = resourceManager.getResourceByParentAndKey(overlord, existingParent,
resource.getResourceKey(), resourceType.getPlugin(), resourceType.getName());
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java
index 009c9e4..2560576 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java
@@ -165,7 +165,7 @@ public interface DiscoveryBossLocal extends DiscoveryBossRemote {
* @param parentResourceId the id of the resource that will be the parent of the manually discovered resource
* @param pluginConfiguration the properties that should be used to connect to the underlying managed resource
*
- * @return the newly discovered resource with any associated {@link ResourceError} that might have occurred during
+ * @return NotNull the newly discovered resource with any associated {@link ResourceError} that might have occurred during
* the activation of the resource
*
* @throws InvalidPluginConfigurationClientException if connecting to the underlying managed resource failed due to
1
0
modules/plugins/jboss-as-5/pom.xml | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 8e27a3acaf35b70ed191b6890cdfd1cc482d82b8
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Jan 25 10:43:53 2013 -0500
make sure we clean up when downloading jboss distro
The ant script that downloads the jboss distro could time out leaving a corrupt
zip file in the tmp dir. This would cause the build to fail and was also
causing subsequent CI builds to fail. Once again, doing tear down in the set up
fixes the problem.
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 2474eec..9c71f33 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -473,6 +473,21 @@
<target>
<property name="as5.zipfile"
location="${java.io.tmpdir}${file.separator}jboss-as-${as5.version}.zip"/>
+
+ <!--
+ Go ahead and clean up the tmp dir first. If in a prior build,
+ we timeout while downloading the jboss distro, we will be left
+ with a corrupt zip file which will cause the build to fail as
+ expected; however, if we do not clean up, then subsequent
+ builds fail as well. Alternatively we could try and set the
+ skipexisting attribute on the get task to false which might
+ also work and be faster but this way ensures we get the
+ correct bits.
+ -->
+ <delete file="${as5.zipfile}"/>
+ <delete dir="${java.io.tmpdir}/jboss-eap-${as5.version}" failonerror="false"/>
+ <delete dir="${jboss5.home}"/>
+
<get src="${as5.url}" dest="${as5.zipfile}"
usetimestamp="true" verbose="true"/>
<unzip src="${as5.zipfile}" dest="${java.io.tmpdir}"/>
@@ -480,7 +495,7 @@
<move file="${java.io.tmpdir}/jboss-${as5.version}"
tofile="${jboss5.home}" failonerror="false"
overwrite="false"/>
- <!-- This works for EAP versions -->
+ <!-- This works for EAP versions -->
<move file="${java.io.tmpdir}/jboss-eap-${as5.version}/jboss-as"
tofile="${jboss5.home}" failonerror="false"
overwrite="false"/>
1
0
.classpath | 4 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 2 +-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit e2bdc6d3239ca85ddc1ad0f4c55d3304c795a27a
Merge: 5fede8e 33f65e9
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 25 10:07:03 2013 -0500
Merge remote-tracking branch 'origin/master' into bug/902406
commit 33f65e91a7b5121774d4e6928bb16ec95a87836e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 25 08:50:06 2013 -0500
point to the proper RHQ wiki docs
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
index b48dd19..c5fa4dc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
@@ -326,7 +326,7 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain
DashboardPortlet news = new DashboardPortlet(MashupPortlet.NAME, MashupPortlet.KEY, 300);
if (isRHQ) {
news.getConfiguration()
- .put(new PropertySimple("address", "https://docs.jboss.org/author/display/RHQ/Home"));
+ .put(new PropertySimple("address", "https://docs.jboss.org/author/display/RHQ/User+Documentation"));
} else {
news.getConfiguration().put(
new PropertySimple("address",
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties
index c3b641e..1e3fbe3 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties
@@ -35,7 +35,7 @@ view_help_section_1_item_count = 3
view_help_section_1_propTitle_1 = Frequently Asked Questions (FAQ)
view_help_section_1_propUrl_1 = https://docs.jboss.org/author/display/RHQ/FAQ
view_help_section_1_propTitle_2 = Documentation Set
-view_help_section_1_propUrl_2 = https://docs.jboss.org/author/display/RHQ/Home
+view_help_section_1_propUrl_2 = https://docs.jboss.org/author/display/RHQ/User+Documentation
view_help_section_1_propTitle_3 = API Javadoc
view_help_section_1_propUrl_3 = https://docs.jboss.org/author/display/RHQ/API+Documentation
@@ -48,7 +48,7 @@ view_help_section_2_propTitle_2 = Demo: Bundle Provisioning
view_help_section_2_propUrl_2 = http://management-platform.blogspot.com/2011/01/bundle-provisioning-via-rhq…
view_help_section_2_propTitle_3 = How to build Group Definitions
view_help_section_2_propIcon_3 = [SKIN]/../actions/help.png
-view_help_section_2_propUrl_3 = http://docs.redhat.com/docs/en-US/JBoss_Operations_Network/2.4/html/Basic_A…
+view_help_section_2_propUrl_3 = https://docs.jboss.org/author/display/RHQ/Group+Definitions
view_help_section_2_propTitle_4 = How to use the Search Bar
view_help_section_2_propIcon_4 = [SKIN]/../actions/help.png
view_help_section_2_propUrl_4 = https://docs.jboss.org/author/display/RHQ/Search
commit 269da6354ef305638316aae2bdcd7039bde62cf3
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Fri Jan 25 10:06:43 2013 +0100
Fix Eclipse classpath file: CDI and javax.inject
diff --git a/.classpath b/.classpath
index 6091ec8..9af3a50 100644
--- a/.classpath
+++ b/.classpath
@@ -336,7 +336,9 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Final/jboss-jms-api_1.1_spec-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/spec/javax/interceptor/jboss-interceptors-api_1.1_spec/1.0.0.Final/jboss-interceptors-api_1.1_spec-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/remotingjmx/remoting-jmx/1.0.2.Final/remoting-jmx-1.0.2.Final.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/remotingjmx/remoting-jmx/1.0.2.Final/remoting-jmx-1.0.2.Final.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/javax/enterprise/cdi-api/1.0-SP4/cdi-api-1.0-SP4.jar" sourcepath="M2_REPO/javax/enterprise/cdi-api/1.0-SP4/cdi-api-1.0-SP4-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/mozilla/rhino/1.7R4/rhino-1.7R4.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/picketbox/picketbox/4.0.7.Final/picketbox-4.0.7.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/python/jython-standalone/2.5.2/jython-standalone-2.5.2.jar"/>
commit 3ded44d88b2700c95d3e107d2cfdbe48524a41e8
Author: Thomas SEGISMONT <tsegismo(a)redhat.com>
Date: Mon Dec 10 21:53:49 2012 +0100
Bug 885664 OpenSSHD and MySQL availability check may report stale data
Refactoring of ProcessInfo
The class has now a subtype which groups non static data and operations on this data.
The purpose is to make clear for users of the class that it caches data and only takes snaphots via SIGAR calls
OpenSSHDComponent and MySQLComponent have their availability check fixed and using this API
Other classes were updated with new API calls for isRunning method
Add lock and interval mechanism to ProcessInfo refresh
This will avoid SIGAR bug when making too close calls to getProcState
Add corresponding test
Fix bad log in ApacheExecutionUtil
Modified Eclipse classpath file
diff --git a/.classpath b/.classpath
index e7fd638..6091ec8 100644
--- a/.classpath
+++ b/.classpath
@@ -13,7 +13,6 @@
<classpathentry kind="src" path="modules/cli-tests/src/main/java"/>
<classpathentry kind="src" path="modules/helpers/jeeGen/src/main/java"/>
<classpathentry kind="src" path="modules/helpers/bundleGen/src/main/java"/>
- <classpathentry kind="src" path="modules/integration-tests/jndi-access/jndi-access-test/src/test/java"/>
<classpathentry kind="src" path="modules/common/drift/src/main/java"/>
<classpathentry kind="src" path="modules/common/drift/src/test/java"/>
<classpathentry kind="src" path="modules/common/ant-bundle/src/test/java"/>
@@ -25,8 +24,9 @@
<classpathentry kind="src" path="modules/core/util/src/test/java"/>
<classpathentry kind="src" path="modules/core/dbutils/src/main/java"/>
<classpathentry kind="src" path="modules/core/dbutils/src/test/java"/>
- <classpathentry kind="src" path="modules/core/native-system/src/main/java"/>
- <classpathentry kind="src" path="modules/core/native-system/src/test/java"/>
+ <classpathentry kind="src" path="modules/core/native-system/src/main/java"/>
+ <classpathentry kind="src" path="modules/core/native-system/src/test/java"/>
+ <classpathentry kind="src" path="modules/core/native-system/src/test/resources"/>
<classpathentry kind="src" path="modules/core/domain/src/main/java"/>
<classpathentry kind="src" path="modules/core/domain/src/test/java"/>
<classpathentry kind="src" path="modules/core/plugin-api/src/main/java"/>
@@ -119,7 +119,9 @@
<classpathentry kind="src" path="modules/plugins/oracle/src/main/java"/>
<classpathentry kind="src" path="modules/plugins/oracle/src/test/java"/>
<classpathentry kind="src" path="modules/plugins/apache/src/main/java"/>
+ <classpathentry kind="src" path="modules/plugins/apache/src/main/resources"/>
<classpathentry kind="src" path="modules/plugins/apache/src/test/java"/>
+ <classpathentry kind="src" path="modules/plugins/apache/src/test/resources"/>
<classpathentry kind="src" path="modules/plugins/script/src/main/java"/>
<classpathentry kind="src" path="modules/plugins/netservices/src/main/java"/>
<classpathentry kind="src" path="modules/plugins/ant-bundle/src/main/java"/>
@@ -176,7 +178,11 @@
<classpathentry kind="src" path="modules/core/arquillian-integration/container/src/test/java"/>
<classpathentry kind="src" path="modules/core/arquillian-integration/container/src/test/resources"/>
<classpathentry kind="src" path="modules/test-utils/src/main/java"/>
- <classpathentry kind="src" path="modules/integration-tests/mod_cluster-plugin-test/src/test/java"/>
+ <classpathentry kind="src" path="modules/integration-tests/apache-plugin-test/src/test/java"/>
+ <classpathentry kind="src" path="modules/integration-tests/apache-plugin-test/src/test/resources"/>
+ <classpathentry kind="src" path="modules/integration-tests/jndi-access/jndi-access-test/src/test/java"/>
+ <classpathentry kind="src" path="modules/integration-tests/jndi-access/jndi-access-test/src/test/resources"/>
+ <classpathentry kind="src" path="modules/integration-tests/mod_cluster-plugin-test/src/test/java"/>
<classpathentry kind="src" path="etc/samples/skeleton-plugin/src/main/java"/>
<classpathentry kind="src" path="etc/samples/custom-serverplugin/src/main/java"/>
<classpathentry kind="src" path="etc/samples/simplereport-serverplugin/src/main/java"/>
@@ -239,7 +245,7 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.3.3.Final/richfaces-ui-3.3.3.Final.jar" sourcepath="/M2_REPO/org/richfaces/ui/richfaces-ui/3.3.0.GA/richfaces-ui-3.3.0.GA-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/postgresql/postgresql/9.2-1002.jdbc4/postgresql-9.2-1002.jdbc4.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.5.132-3/sigar-1.6.5.132-3.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.3.82/sigar-1.6.3.82-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.5.132-3/sigar-1.6.5.132-3.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.5.132-3/sigar-1.6.5.132-3-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jbossts/jbossjts/4.16.2.Final/jbossjts-4.16.2.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.jar"/>
@@ -335,9 +341,12 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/picketbox/picketbox/4.0.7.Final/picketbox-4.0.7.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/python/jython-standalone/2.5.2/jython-standalone-2.5.2.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/com/wordnik/swagger-annotations_2.9.1/1.1.1-SNAPSHOT/swagger-annotations_2.9.1-1.1.1-20121031.024335-6.jar"/>
- <classpathentry exported="true" kind="var" path="JDK_HOME/lib/tools.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/joda-time/joda-time/2.1/joda-time-2.1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/apache/cassandra/cassandra-thrift/1.1.5/cassandra-thrift-1.1.5.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/hectorclient/hector-core/1.1-1/hector-core-1.1-1.jar"/>
- <classpathentry kind="output" path="eclipse-classes"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-install/1.5.2/byteman-install-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-install/1.5.2/byteman-install-1.5.2-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-submit/1.5.2/byteman-submit-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-submit/1.5.2/byteman-submit-1.5.2-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-bmunit/1.5.2/byteman-bmunit-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-bmunit/1.5.2/byteman-bmunit-1.5.2-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="JDK_HOME/lib/tools.jar"/>
+ <classpathentry kind="output" path="eclipse-classes"/>
</classpath>
diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/AggregateProcessInfo.java b/modules/core/native-system/src/main/java/org/rhq/core/system/AggregateProcessInfo.java
index 271a869..144c4f4 100644
--- a/modules/core/native-system/src/main/java/org/rhq/core/system/AggregateProcessInfo.java
+++ b/modules/core/native-system/src/main/java/org/rhq/core/system/AggregateProcessInfo.java
@@ -24,10 +24,10 @@ package org.rhq.core.system;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.HashSet;
import org.hyperic.sigar.ProcCpu;
import org.hyperic.sigar.ProcFd;
@@ -110,23 +110,26 @@ public class AggregateProcessInfo extends ProcessInfo {
// There are some instances where SIGAR can't get one or more of these (maybe permission issues?).
// Do not bomb if we can't get one or more of these - we'll just handle nulls appropriately.
+ // It is safe to get the prior snapshot as we just called super.refresh
+ ProcessInfoSnapshot priorSnaphot = priorSnaphot();
+
try {
- procTimes.add(super.procTime);
+ procTimes.add(priorSnaphot.getTime());
} catch (Exception e) {
}
try {
- procMems.add(super.procMem);
+ procMems.add(priorSnaphot.getMemory());
} catch (Exception e) {
}
try {
- procCpus.add(super.procCpu);
+ procCpus.add(priorSnaphot.getCpu());
} catch (Exception e) {
}
try {
- procFds.add(super.procFd);
+ procFds.add(priorSnaphot.getFileDescriptor());
} catch (Exception e) {
}
diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java b/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java
index 39b0f0f..7f994ed 100644
--- a/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java
+++ b/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
+ * Copyright (C) 2005-2013 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -49,39 +51,229 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
+ * <p>
* Encapsulates information about a known process.
+ * </p>
+ * <p>
+ * A few process properties (i.e. PID, command line) will never change during the lifetime of the process and can be
+ * read directly with this class accessors. Other process properties (i.e. state, cpu usage) will vary and their values
+ * are grouped in {@link ProcessInfoSnapshot} instances.
+ * </p>
+ * <p>
+ * Operations on static properties of the process must be implemented in the {@link ProcessInfo} type. Operations on
+ * non static properties must be implemented in the {@link ProcessInfoSnapshot} type. The {@link ProcessInfoSnapshot}
+ * subtype has been created to remind users of the class that they are working with cached data.
+ * </p>
+ * <p>For example, if you want to be sure a process is still alive, you should use this code:<br>
+ * <code>processInfo.freshSnapshot().isRunning()</code>
+ * </p>
+ * <p>Rather than:<br>
+ * <code>processInfo.priorSnapshot().isRunning()</code>
+ * </p>
*
* @author John Mazzitelli
* @author Ian Springer
+ * @author Thomas Segismont
*/
public class ProcessInfo {
- private final Log log = LogFactory.getLog(ProcessInfo.class.getName());
+
+ /**
+ * <p>
+ * Exposes non static process properties and operations computed on them (like {@link #isRunning()} method).
+ * Operations on non static process properties should all be implemented here.
+ * </p>
+ * <p>
+ * New snapshots are created when {@link ProcessInfo#refresh()} or {@link ProcessInfo#freshSnapshot()} are
+ * called.
+ * </p>
+ * <p>
+ * Note the current implementation does not actually encapsulate these properties for backward compatibility
+ * reasons (we have to keep the write access to {@link ProcessInfo} protected properties).
+ * </p>
+ */
+ public final class ProcessInfoSnapshot {
+
+ public long getParentPid() throws SystemInfoException {
+ return (ProcessInfo.this.procState != null) ? ProcessInfo.this.procState.getPpid() : 0L;
+ }
+
+ public ProcState getState() throws SystemInfoException {
+ return ProcessInfo.this.procState;
+ }
+
+ public ProcExe getExecutable() throws SystemInfoException {
+ return ProcessInfo.this.procExe;
+ }
+
+ public ProcTime getTime() throws SystemInfoException {
+ return ProcessInfo.this.procTime;
+ }
+
+ public ProcMem getMemory() throws SystemInfoException {
+ return ProcessInfo.this.procMem;
+ }
+
+ public ProcCpu getCpu() throws SystemInfoException {
+ return ProcessInfo.this.procCpu;
+ }
+
+ public ProcFd getFileDescriptor() throws SystemInfoException {
+ return ProcessInfo.this.procFd;
+ }
+
+ public ProcCred getCredentials() throws SystemInfoException {
+ return ProcessInfo.this.procCred;
+ }
+
+ public ProcCredName getCredentialsName() throws SystemInfoException {
+ return ProcessInfo.this.procCredName;
+ }
+
+ /**
+ * @return null if process executable or cwd is unavailable. Otherwise the Cwd as returned from the
+ * process executable.
+ * @throws SystemInfoException
+ */
+ public String getCurrentWorkingDirectory() throws SystemInfoException {
+ String result = null;
+ try {
+ if (null != ProcessInfo.this.procExe) {
+ result = ProcessInfo.this.procExe.getCwd();
+ }
+ } catch (Exception e) {
+ ProcessInfo.this.handleSigarCallException(e, "procExe.getCwd()");
+ }
+ return result;
+ }
+
+ /**
+ * Checks if the process is alive.
+ *
+ * @return true if the process is running, sleeping or idle
+ * @throws SystemInfoException
+ */
+ public boolean isRunning() throws SystemInfoException {
+ boolean running = false;
+ if (ProcessInfo.this.procState != null) {
+ running = (ProcessInfo.this.procState.getState() == ProcState.RUN
+ || ProcessInfo.this.procState.getState() == ProcState.SLEEP || ProcessInfo.this.procState
+ .getState() == ProcState.IDLE);
+
+ }
+ return running;
+ }
+
+ }
+
+ private static final Log LOG = LogFactory.getLog(ProcessInfo.class);
+
+ // This interval was introduced because of a SIGAR bug: too close calls to getProcState could
+ // return different values even if the underlying process state has not changed.
+ private static final int REFRESH_INTERVAL_MILLIS = 1000 * 2;
+
+ // This timeout should always be greater than the refresh interval as one thread which acquired the lock
+ // could be waiting for the refresh interval to elapse. This value is deliberately high because multiple
+ // threads could wait for the lock and each of them will also have to wait for the refresh interval to elapse.
+ private static final int REFRESH_LOCK_ACQUIRE_TIMEOUT_SECONDS = 30;
+
+ private static final String UNKNOWN_PROCESS_NAME = "?";
+
+ private static final Set<String> MS_WINDOWS_TERMINATE_SIGNAL_NAMES = new HashSet<String>();
+ static {
+ MS_WINDOWS_TERMINATE_SIGNAL_NAMES.add("INT");
+ MS_WINDOWS_TERMINATE_SIGNAL_NAMES.add("KILL");
+ MS_WINDOWS_TERMINATE_SIGNAL_NAMES.add("QUIT");
+ MS_WINDOWS_TERMINATE_SIGNAL_NAMES.add("TERM");
+ }
protected boolean initialized;
+ protected SigarProxy sigar;
+
// these are static - values remain for the life of this object
protected long pid;
protected String name;
- protected String baseName;
protected String[] commandLine;
+ protected Map<String, String> procEnv;
+
+ // these are computed once with static data (purposely lazy in order to speed up discovery process)
protected Map<String, String> environmentVariables;
- protected SigarProxy sigar;
+ protected String baseName;
+
+ // this one is computed once with non static data
+ protected ProcessInfo parentProcess;
// these are refreshed and may change during the life of the process
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcState procState;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcExe procExe;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcTime procTime;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcMem procMem;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcCpu procCpu;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcFd procFd;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcCred procCred;
+
+ /**
+ * @deprecated as of 4.6. To read this property call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
protected ProcCredName procCredName;
- protected Map<String, String> procEnv;
- protected transient ProcessInfo parentProcess;
- protected transient boolean processDied;
+ // Set to true in handleSigarCallException
+ protected boolean processDied;
+
+ // Set to true if a SIGAR permission error has already been logged
private boolean loggedPermissionsError = false;
- private static final String UNKNOWN = "?";
+
+ // The last snasphot of non static process properties
+ // In a future implementation a new snapshot will be created on each call to refresh
+ private ProcessInfoSnapshot snapshot = new ProcessInfoSnapshot();
+
+ private long nextRefreshTime = System.currentTimeMillis();
+
+ private ReentrantLock refreshLock = new ReentrantLock();
// useful for mocking this object, this is purposely not public
protected ProcessInfo() {
@@ -97,15 +289,58 @@ public class ProcessInfo {
update(pid);
}
+ /**
+ * Takes a fresh snapshot of non static properties of the underlying process
+ *
+ * @throws SystemInfoException
+ */
public void refresh() throws SystemInfoException {
- update(this.pid);
+ // SIGAR has a bug: too close calls to getProcState could return different values even if the underlying
+ // process state has not changed. To be sure to get correct data, a lock and an interval were introduced.
+ // Calling threads must acquire the lock and then make sure the interval has elapsed before calling update.
+ boolean acquiredLock = false;
+ try {
+ acquiredLock = refreshLock.tryLock(REFRESH_LOCK_ACQUIRE_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ LOG.error("Thread interrupted while trying to acquire ProcessInfo[" + this.pid + "] refresh lock", e);
+ }
+ if (!acquiredLock) {
+ throw new RuntimeException("Could not acquire ProcessInfo[" + this.pid + "] refresh lock");
+ }
+ try {
+ waitForNextRefreshTime();
+ update(this.pid);
+ } finally {
+ nextRefreshTime = System.currentTimeMillis() + REFRESH_INTERVAL_MILLIS;
+ refreshLock.unlock();
+ }
+ }
+
+ private void waitForNextRefreshTime() {
+ for (;;) {
+ long timeToNextRefresh = nextRefreshTime - System.currentTimeMillis();
+ if (timeToNextRefresh > 0) {
+ try {
+ Thread.sleep(timeToNextRefresh);
+ break;
+ } catch (InterruptedException ignore) {
+ }
+ } else {
+ break;
+ }
+ }
}
+ // Refresh and update methods cannot be merged because subclasses may override refresh behavior
+ // and we can't be sure that instances will already be properly initialized.
private void update(long pid) throws SystemInfoException {
long startTime = System.currentTimeMillis();
try {
+
this.processDied = false;
+ // Get ProcState and ProcExe before static data as they can help to determine the name field in some cases.
+
ProcState procState = null;
try {
procState = sigar.getProcState(pid);
@@ -138,7 +373,7 @@ public class ProcessInfo {
try {
this.procEnv = sigar.getProcEnv(pid);
if (this.procEnv == null) {
- log.debug("SIGAR returned a null environment for [" + this.baseName + "] process with pid ["
+ LOG.debug("SIGAR returned a null environment for [" + getBaseName() + "] process with pid ["
+ this.pid + "].");
}
} catch (Exception e) {
@@ -190,14 +425,39 @@ public class ProcessInfo {
} catch (Exception e) {
throw new SystemInfoException(e);
}
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
long elapsedTime = System.currentTimeMillis() - startTime;
- log.trace("Retrieval of process info for pid " + pid + " took " + elapsedTime + " ms.");
+ LOG.trace("Retrieval of process info for pid " + pid + " took " + elapsedTime + " ms.");
}
this.processDied = false;
}
+ /**
+ * <p>
+ * Returns the last snasphot of the non static process properties.
+ * </p>
+ * <p>
+ * Caveat the returned may hold stale data has it was taken with previous SIGAR calls.
+ * Calling {@link #freshSnapshot()} instead is almost always a better idea.
+ * </p>
+ *
+ * @return a {@link ProcessInfoSnapshot} possibly holding stale data
+ */
+ public ProcessInfoSnapshot priorSnaphot() {
+ return snapshot;
+ }
+
+ /**
+ * Takes a fresh snapshot of the non static process properties.
+ *
+ * @return a fresh {@link ProcessInfoSnapshot}
+ */
+ public ProcessInfoSnapshot freshSnapshot() {
+ refresh();
+ return snapshot;
+ }
+
public void destroy() throws SystemInfoException {
if (this.sigar instanceof Sigar) {
try {
@@ -215,7 +475,7 @@ public class ProcessInfo {
return;
}
- if (isWindows() && (this.pid == 0 || this.pid == 4)) {
+ if (OperatingSystem.IS_WIN32 && (this.pid == 0 || this.pid == 4)) {
// On Windows, Pid 0 and Pid 4 are special Kernel processes (Pid 0 is the "System Idle Process" and Pid 4 is
// the "System" process). For these processes, it's normal for many of the Sigar.getProc calls to fail, so
// there's no need to log anything.
@@ -227,29 +487,28 @@ public class ProcessInfo {
if (!this.loggedPermissionsError) {
// Only log permissions errors once per process.
String currentUserName = System.getProperty("user.name");
- log
- .trace("Unable to obtain all info for ["
- + procName
- + "] process with pid ["
- + this.pid
- + "] - call to "
- + methodName
- + "failed. "
- + "The process is most likely owned by a user other than the user that owns the RHQ plugin container's process ("
- + currentUserName + ").");
+ LOG.trace("Unable to obtain all info for ["
+ + procName
+ + "] process with pid ["
+ + this.pid
+ + "] - call to "
+ + methodName
+ + "failed. "
+ + "The process is most likely owned by a user other than the user that owns the RHQ plugin container's process ("
+ + currentUserName + ").");
this.loggedPermissionsError = true;
}
} else if (e instanceof SigarNotImplementedException) {
- log.trace("Unable to obtain all info for [" + procName + "] process with pid [" + this.pid + "] - call to "
+ LOG.trace("Unable to obtain all info for [" + procName + "] process with pid [" + this.pid + "] - call to "
+ methodName + "failed. Cause: " + e);
} else {
if (!exists()) {
- log.debug("Attempt to refresh info for process with pid [" + this.pid
- + "] failed, because the process is no longer running.");
+ LOG.debug("Attempt to refresh info for process with pid [" + this.pid
+ + "] failed, because the process is no longer running.");
this.processDied = true;
}
- log.debug("Unexpected error occurred while looking up info for [" + procName + "] process with pid ["
+ LOG.debug("Unexpected error occurred while looking up info for [" + procName + "] process with pid ["
+ this.pid + "] - call to " + methodName + " failed. Did the process die? Cause: " + e);
}
}
@@ -260,7 +519,7 @@ public class ProcessInfo {
pids = sigar.getProcList();
} catch (SigarException e1) {
// TODO (ips, 04/30/12): It probably makes more sense to let this exception bubble up.
- log.error("Failed to obtain process list.", e1);
+ LOG.error("Failed to obtain process list.", e1);
return true;
}
@@ -274,10 +533,6 @@ public class ProcessInfo {
return foundProcess;
}
- private static boolean isWindows() {
- return File.separatorChar == '\\';
- }
-
private String determineName(String[] procArgs, ProcExe procExe, ProcState procState) {
String name;
if ((procArgs != null) && (procArgs.length != 0)) {
@@ -286,9 +541,10 @@ public class ProcessInfo {
name = procExe.getName();
} else if ((procState != null) && (procState.getName() != null)) {
String stateName = procState.getName();
- name = ((stateName.indexOf(File.separatorChar) >= 0) && (new File(stateName).exists())) ? stateName : UNKNOWN;
+ name = ((stateName.indexOf(File.separatorChar) >= 0) && (new File(stateName).exists())) ? stateName
+ : UNKNOWN_PROCESS_NAME;
} else {
- name = UNKNOWN;
+ name = UNKNOWN_PROCESS_NAME;
}
return name;
}
@@ -323,7 +579,7 @@ public class ProcessInfo {
*/
public String getBaseName() {
if (baseName == null) {
- baseName = (getName() != null) ? new File(getName()).getName() : UNKNOWN;
+ baseName = (getName() != null) ? new File(getName()).getName() : UNKNOWN_PROCESS_NAME;
}
return baseName;
}
@@ -361,82 +617,114 @@ public class ProcessInfo {
* @return the environment value
*/
@Nullable
- public String getEnvironmentVariable(@NotNull String name) {
+ public String getEnvironmentVariable(@NotNull
+ String name) {
if (this.procEnv == null) {
return null;
}
-
SystemInfo systemInfo = SystemInfoFactory.createJavaSystemInfo();
boolean isWindows = systemInfo.getOperatingSystemType() == OperatingSystemType.WINDOWS;
// Windows env names are case insensitive, so convert the specified name to all-caps before doing the lookup.
return getEnvironmentVariables().get((isWindows) ? name.toUpperCase() : name);
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public long getParentPid() throws SystemInfoException {
- return (this.procState != null) ? this.procState.getPpid() : 0L;
+ return priorSnaphot().getParentPid();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcState getState() throws SystemInfoException {
- return this.procState;
+ return priorSnaphot().getState();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcExe getExecutable() throws SystemInfoException {
- return this.procExe;
+ return priorSnaphot().getExecutable();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcTime getTime() throws SystemInfoException {
- return this.procTime;
+ return priorSnaphot().getTime();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcMem getMemory() throws SystemInfoException {
- return this.procMem;
+ return priorSnaphot().getMemory();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcCpu getCpu() throws SystemInfoException {
- return this.procCpu;
+ return priorSnaphot().getCpu();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcFd getFileDescriptor() throws SystemInfoException {
- return this.procFd;
+ return priorSnaphot().getFileDescriptor();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcCred getCredentials() throws SystemInfoException {
- return this.procCred;
+ return priorSnaphot().getCredentials();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public ProcCredName getCredentialsName() throws SystemInfoException {
- return this.procCredName;
+ return priorSnaphot().getCredentialsName();
}
/**
- * @return null if process executable or cwd is unavailable. Otherwise the Cwd as returned from the
- * process executable.
- * @throws SystemInfoException
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
*/
+ @Deprecated
public String getCurrentWorkingDirectory() throws SystemInfoException {
- String result = null;
-
- try {
- if (null != this.procExe) {
- result = this.procExe.getCwd();
- }
- } catch (Exception e) {
- handleSigarCallException(e, "procExe.getCwd()");
- }
-
- return result;
+ return priorSnaphot().getCurrentWorkingDirectory();
}
+ /**
+ * @deprecated as of 4.6. For similar purpose, call {@link #priorSnaphot()} and then corresponding method
+ * from the returned {@link ProcessInfoSnapshot}.
+ */
+ @Deprecated
public boolean isRunning() throws SystemInfoException {
- boolean running = false;
-
- if (this.procState != null) {
- running = (this.procState.getState() == ProcState.RUN || this.procState.getState() == ProcState.SLEEP || this.procState
- .getState() == ProcState.IDLE);
-
- }
-
- return running;
+ return priorSnaphot().isRunning();
}
/**
@@ -450,13 +738,18 @@ public class ProcessInfo {
}
/**
- * Returns the parent process of this process.
+ * Returns a {@link ProcessInfo} instance for the parent of this process.
+ *
+ * This method uses the parent process id which is not static (it can change if the parent process dies before its
+ * child). So in theory it should be moved to the {@link ProcessInfoSnapshot} type.
+ *
+ * In practice, it stays here because the parent {@link ProcessInfo} instance is cached after creation.
*
* @since 4.4
*/
public ProcessInfo getParentProcess() throws SystemInfoException {
if (this.parentProcess == null) {
- this.parentProcess = new ProcessInfo(getParentPid(), sigar);
+ this.parentProcess = new ProcessInfo(priorSnaphot().getParentPid(), sigar);
} else {
this.parentProcess.refresh();
}
@@ -515,44 +808,32 @@ public class ProcessInfo {
@Override
public String toString() {
StringBuilder s = new StringBuilder("process: ");
-
s.append("pid=[");
s.append(getPid());
s.append("], name=[");
- s.append((!getName().equals(UNKNOWN)) ? getName() : getBaseName());
+ s.append((!getName().equals(UNKNOWN_PROCESS_NAME)) ? getName() : getBaseName());
s.append("], ppid=[");
try {
- s.append(getParentPid());
+ s.append(priorSnaphot().getParentPid());
} catch (Exception e) {
s.append(e);
}
-
s.append("]");
-
return s.toString();
}
- private static final Set<String> TERMINATE_SIGNAL_NAMES = new HashSet<String>();
- static {
- TERMINATE_SIGNAL_NAMES.add("INT");
- TERMINATE_SIGNAL_NAMES.add("KILL");
- TERMINATE_SIGNAL_NAMES.add("QUIT");
- TERMINATE_SIGNAL_NAMES.add("TERM");
- }
-
private static int getSignalNumber(String signalName) {
if (signalName == null) {
throw new IllegalArgumentException("Signal name is null.");
}
-
int signalNumber;
if (OperatingSystem.IS_WIN32) {
- if (TERMINATE_SIGNAL_NAMES.contains(signalName)) {
+ if (MS_WINDOWS_TERMINATE_SIGNAL_NAMES.contains(signalName)) {
signalNumber = 1;
} else {
throw new IllegalArgumentException("Unsupported signal name: " + signalName
- + " - on Windows, the only supported signal names are " + TERMINATE_SIGNAL_NAMES
- + ", all of which return 1.");
+ + " - on Windows, the only supported signal names are " + MS_WINDOWS_TERMINATE_SIGNAL_NAMES
+ + ", all of which return 1.");
}
} else {
signalNumber = Sigar.getSigNum(signalName);
diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/ProcessInfoRefreshIntervalTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/ProcessInfoRefreshIntervalTest.java
new file mode 100644
index 0000000..84944ef
--- /dev/null
+++ b/modules/core/native-system/src/test/java/org/rhq/core/system/ProcessInfoRefreshIntervalTest.java
@@ -0,0 +1,175 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.core.system;
+
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hyperic.sigar.OperatingSystem;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import org.rhq.core.util.stream.StreamUtil;
+
+/**
+ * @author Thomas Segismont
+ */
+public class ProcessInfoRefreshIntervalTest {
+
+ private static final Log LOG = LogFactory.getLog(ProcessInfoRefreshIntervalTest.class);
+
+ private static final String KNOWN_ARG = "hellosigar";
+
+ private Process testProcess;
+
+ private ProcessInfo testProcessInfo;
+
+ private ExecutorService executorService;
+
+ @BeforeTest(alwaysRun = true)
+ public void setup() throws Exception {
+ testProcess = createTestProcess();
+ if (!isAlive(testProcess)) {
+ throw new RuntimeException("Test process is not alive");
+ }
+ NativeSystemInfo systemInfo = new NativeSystemInfo();
+ List<ProcessInfo> foundProcesses = systemInfo.getProcesses("arg|" + KNOWN_ARG + "|match=.*");
+ if (foundProcesses.size() != 1) {
+ throw new RuntimeException("Found " + foundProcesses.size() + " with arg [" + KNOWN_ARG + "]");
+ }
+ testProcessInfo = foundProcesses.iterator().next();
+ int threadCount = Runtime.getRuntime().availableProcessors();
+ executorService = Executors.newFixedThreadPool(threadCount);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Created an executor service with " + threadCount + " threads");
+ }
+ }
+
+ private Process createTestProcess() throws Exception {
+ if (OperatingSystem.IS_WIN32) {
+ // On Windows run a simple bat file which behaves like 'watch echo'
+ File batFile = File.createTempFile("win-watch-echo", ".bat");
+ batFile.deleteOnExit();
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/rhq/core/system/win-watch-echo.bat");
+ OutputStream os = new FileOutputStream(batFile);
+ StreamUtil.copy(is, os, true);
+ ProcessBuilder processBuilder = new ProcessBuilder("cmd", batFile.getAbsolutePath(), KNOWN_ARG);
+ return processBuilder.start();
+ } else {
+ // On other systems run a simple bash file which behaves like 'watch echo'
+ File bashFile = File.createTempFile("bash-watch-echo", ".sh");
+ bashFile.deleteOnExit();
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/rhq/core/system/bash-watch-echo.sh");
+ OutputStream os = new FileOutputStream(bashFile);
+ StreamUtil.copy(is, os, true);
+ ProcessBuilder processBuilder = new ProcessBuilder("bash", bashFile.getAbsolutePath(), KNOWN_ARG);
+ return processBuilder.start();
+ }
+ }
+
+ @AfterTest(alwaysRun = true)
+ public void tearDown() {
+ if (testProcess != null) {
+ testProcess.destroy();
+ testProcess = null;
+ }
+ testProcessInfo = null;
+ if (executorService != null) {
+ executorService.shutdownNow();
+ }
+ }
+
+ /**
+ * We want to be sure that conccurent calls to refresh method will result in correct process state
+ * detection - see comments in {@link ProcessInfo#refresh()}.
+ * @throws Exception
+ */
+ @Test(timeOut = 1000 * 60)
+ public void testRefreshInterval() throws Exception {
+ // Create and execute tasks which will ask a freshSnapshot of the processInfo and check if it is running
+ List<Future<Boolean>> futures = submitStateTestingTasks();
+ for (Future<Boolean> future : futures) {
+ // All tasks should see the process running
+ assertTrue(future.get());
+ }
+ // Send kill
+ testProcess.destroy();
+ // Wait for death
+ while (isAlive(testProcess)) {
+ Thread.sleep(100);
+ }
+ // Create and execute tasks again
+ futures = submitStateTestingTasks();
+ for (Future<Boolean> future : futures) {
+ // All tasks should now see the process down
+ assertFalse(future.get());
+ }
+ }
+
+ private List<Future<Boolean>> submitStateTestingTasks() {
+ List<Future<Boolean>> futures = new LinkedList<Future<Boolean>>();
+ for (int i = 0; i < 5; i++) {
+ final int index = i;
+ futures.add(executorService.submit(new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() throws Exception {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Execute state testing task[" + index + "]");
+ }
+ boolean isRunning = testProcessInfo.freshSnapshot().isRunning();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("State testing task[" + index + "] result: " + isRunning);
+ }
+ return isRunning;
+ }
+ }));
+ }
+ return futures;
+ }
+
+ private boolean isAlive(Process process) {
+ if (process == null) {
+ return false;
+ }
+ try {
+ process.exitValue();
+ return false;
+ } catch (IllegalThreadStateException e) {
+ return true;
+ }
+ }
+
+}
diff --git a/modules/core/native-system/src/test/resources/org/rhq/core/system/bash-watch-echo.sh b/modules/core/native-system/src/test/resources/org/rhq/core/system/bash-watch-echo.sh
new file mode 100644
index 0000000..7d0f4c0
--- /dev/null
+++ b/modules/core/native-system/src/test/resources/org/rhq/core/system/bash-watch-echo.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+while :
+do
+ echo $1
+ sleep 1
+done
diff --git a/modules/core/native-system/src/test/resources/org/rhq/core/system/win-watch-echo.bat b/modules/core/native-system/src/test/resources/org/rhq/core/system/win-watch-echo.bat
new file mode 100644
index 0000000..4404159
--- /dev/null
+++ b/modules/core/native-system/src/test/resources/org/rhq/core/system/win-watch-echo.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+:loop
+ echo %1
+ timeout /t 2
+goto loop
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java
index 76ccf39..16d7bbc 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java
@@ -310,6 +310,9 @@ public class ResourceContext<T extends ResourceComponent<?>> {
* Returns the information on the native operating system process in which the managed resource is running. If
* native support is not available or the process for some reason can no longer be found, this may return <code>
* null</code>.
+ *
+ * The returned {@link ProcessInfo} always has a fresh snapshot of non static data: it's whether newly created
+ * or got refreshed in order to determine if the process was still running.
*
* @return information on the resource's process
*/
@@ -350,9 +353,9 @@ public class ResourceContext<T extends ResourceComponent<?>> {
details = this.resourceDiscoveryComponent.discoverResources(context);
}
-
+
trackedProcesses.update(details);
- processInfo = trackedProcesses.getProcessInfo(resourceKey);
+ processInfo = trackedProcesses.getProcessInfo(resourceKey);
} catch (Exception e) {
LOG.warn("Cannot get native process for resource [" + this.resourceKey + "] - discovery failed", e);
}
@@ -366,22 +369,8 @@ public class ResourceContext<T extends ResourceComponent<?>> {
return processInfo;
}
- /**
- * @param processInfo
- * @return
- */
private boolean isRediscoveryRequired(ProcessInfo processInfo) {
- boolean rediscover = processInfo == null;
-
- if (!rediscover) {
- //if the process info thinks the process is running,
- //refresh it to check its facts again
- if (processInfo.isRunning()) {
- processInfo.refresh();
- }
- rediscover = !processInfo.isRunning();
- }
- return rediscover;
+ return processInfo == null || !processInfo.freshSnapshot().isRunning();
}
/**
@@ -519,6 +508,7 @@ public class ResourceContext<T extends ResourceComponent<?>> {
/**
* @deprecated Use {@link AvailabilityContext#createAvailabilityCollectorRunnable(AvailabilityFacet, long)}
*/
+ @Deprecated
public AvailabilityCollectorRunnable createAvailabilityCollectorRunnable(AvailabilityFacet availChecker,
long interval) {
diff --git a/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java b/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
index 64ab1c0..53f7f0c 100644
--- a/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
+++ b/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
@@ -185,8 +185,7 @@ public class ApacheExecutionUtil {
OperationResult res = serverComponent.invokeOperation(operation, new Configuration());
LOG.debug("Invoked operation '" + operation + "' on " + resourceContext.getResourceKey() + " (waiting for "
- + desiredState + "), attempt " + i + ": "
- + res.getComplexResults().getMap().toString());
+ + desiredState + "), attempt " + i + ": " + res.getComplexResults().getMap().toString());
//wait for max 30s for the operation to "express" itself
int w = 0;
@@ -212,7 +211,11 @@ public class ApacheExecutionUtil {
++i;
- LOG.warn("Could not detect the httpd process after invoking the start operation but the operation didn't throw any exception. I will retry at most ten times and then fail loudly. This has been attempt no. "
+ LOG.warn("httpd process is in an unexpected state after invoking the '"
+ + operation
+ + "' operation on "
+ + resourceContext.getResourceKey()
+ + " but the operation didn't throw any exception. I will retry at most ten times and then fail loudly. This has been attempt no. "
+ i);
}
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java
index 5f22f83..efecc27 100644
--- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java
+++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java
@@ -54,6 +54,7 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility;
import org.rhq.core.system.ProcessExecution;
import org.rhq.core.system.ProcessExecutionResults;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot;
import org.rhq.core.system.SystemInfo;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.plugins.jmx.JMXServerComponent;
@@ -73,10 +74,14 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent
if (processInfo == null) {
return UNKNOWN;
- } else if (processInfo.isRunning()) {
- return UP;
} else {
- return DOWN;
+ // It is safe to read prior snapshot as getNativeProcess always return a fresh instance
+ ProcessInfoSnapshot processInfoSnaphot = processInfo.priorSnaphot();
+ if (processInfoSnaphot.isRunning()) {
+ return UP;
+ } else {
+ return DOWN;
+ }
}
}
diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java
index c3a590c..ef1c8c5 100644
--- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java
+++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java
@@ -33,7 +33,6 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementDataTrait;
import org.rhq.core.domain.measurement.MeasurementDefinition;
@@ -52,8 +51,6 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.system.ProcessInfo;
-import org.rhq.plugins.hadoop.calltime.HadoopEventAndCalltimeDelegate;
-import org.rhq.plugins.hadoop.calltime.JobSummary;
import org.rhq.plugins.jmx.JMXComponent;
import org.rhq.plugins.jmx.JMXServerComponent;
@@ -61,18 +58,18 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
JMXComponent<ResourceComponent<?>>, MeasurementFacet, OperationFacet, ConfigurationFacet {
private static final Log LOG = LogFactory.getLog(HadoopServerComponent.class);
-
+
public static final String LOG_EVENT_TYPE = "logEntry";
public static final String LOG_POLLING_INTERVAL_PROPERTY = "logPollingInterval";
-
+
private Map<String, Boolean> percentageMeasurements;
-
+
private HadoopServerConfigurationDelegate configurationDelegate;
-
+
private HadoopOperationsDelegate operationsDelegate;
private boolean eventsRegistered;
-
+
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void start(ResourceContext context) throws Exception {
@@ -84,10 +81,11 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
Set<MeasurementDefinition> measDefinitions = context.getResourceType().getMetricDefinitions();
percentageMeasurements = new HashMap<String, Boolean>(measDefinitions.size());
for (MeasurementDefinition measDefinition : measDefinitions) {
- percentageMeasurements.put(measDefinition.getName(), MeasurementUnits.PERCENTAGE.equals(measDefinition.getUnits()));
+ percentageMeasurements.put(measDefinition.getName(),
+ MeasurementUnits.PERCENTAGE.equals(measDefinition.getUnits()));
}
}
-
+
@Override
public void stop() {
EventContext events = getResourceContext().getEventContext();
@@ -98,7 +96,7 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
}
super.stop();
}
-
+
/**
* Return availability of this resource
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
@@ -106,15 +104,18 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
@Override
public AvailabilityType getAvailability() {
ProcessInfo process = getResourceContext().getNativeProcess();
-
- AvailabilityType ret = process == null ? AvailabilityType.DOWN : (process.isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN);
-
+
+ // It is safe to read prior snapshot as getNativeProcess always return a fresh instance
+ AvailabilityType ret = process == null ? AvailabilityType.DOWN
+ : (process.priorSnaphot().isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN);
+
EventContext events = getResourceContext().getEventContext();
if (events != null) {
if (ret == AvailabilityType.UP) {
if (!eventsRegistered) {
File logFile = determineLogFile();
- int interval = Integer.parseInt(getResourceContext().getPluginConfiguration().getSimpleValue(LOG_POLLING_INTERVAL_PROPERTY, "60"));
+ int interval = Integer.parseInt(getResourceContext().getPluginConfiguration().getSimpleValue(
+ LOG_POLLING_INTERVAL_PROPERTY, "60"));
events.registerEventPoller(createNewEventPoller(events, logFile), interval);
eventsRegistered = true;
}
@@ -124,7 +125,7 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
discardPoller();
}
}
-
+
return ret;
}
@@ -148,7 +149,7 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
handleMetric(report, request);
}
}
-
+
protected void handleMetric(MeasurementReport report, MeasurementScheduleRequest request) throws Exception {
String name = request.getName();
int delimIndex = name.lastIndexOf(':');
@@ -169,7 +170,7 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
} else {
report.addData(new MeasurementDataNumeric(request, value.doubleValue()));
}
-
+
} else {
report.addData(new MeasurementDataTrait(request, valueObject.toString()));
}
@@ -183,14 +184,14 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
LOG.error("Failed to obtain measurement [" + name + "]", e);
}
}
-
+
@Override
public Configuration loadResourceConfiguration() throws Exception {
return configurationDelegate.loadConfiguration();
}
@Override
- public void updateResourceConfiguration(ConfigurationUpdateReport report) {
+ public void updateResourceConfiguration(ConfigurationUpdateReport report) {
try {
Configuration updatedConfiguration = report.getConfiguration();
configurationDelegate.updateConfiguration(updatedConfiguration);
@@ -218,37 +219,38 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
}
return result;
}
-
+
protected EventPoller createNewEventPoller(EventContext eventContext, File logFile) {
- return new LogFileEventPoller(eventContext, LOG_EVENT_TYPE, logFile, new Log4JLogEntryProcessor(LOG_EVENT_TYPE, logFile));
+ return new LogFileEventPoller(eventContext, LOG_EVENT_TYPE, logFile, new Log4JLogEntryProcessor(LOG_EVENT_TYPE,
+ logFile));
}
-
+
protected void discardPoller() {
-
+
}
-
+
private File determineLogFile() {
String username = getResourceContext().getNativeProcess().getCredentialsName().getUser();
String hostname = getResourceContext().getSystemInformation().getHostname();
-
+
String serverType = getServerType();
-
+
String name = "hadoop-" + username + "-" + serverType + "-" + hostname + ".log";
-
+
return new File(new File(getHomeDir(), "logs"), name);
}
-
+
private String getServerType() {
String mainClass = getResourceContext().getPluginConfiguration().getSimpleValue("_mainClass");
int dot = mainClass.lastIndexOf('.');
String className = mainClass.substring(dot + 1);
-
+
return className.toLowerCase();
}
-
+
protected File getHomeDir() {
- File homeDir =
- new File(getResourceContext().getPluginConfiguration().getSimpleValue(HadoopServerDiscovery.HOME_DIR_PROPERTY));
+ File homeDir = new File(getResourceContext().getPluginConfiguration().getSimpleValue(
+ HadoopServerDiscovery.HOME_DIR_PROPERTY));
if (!homeDir.exists()) {
throw new IllegalArgumentException("The configured home directory of this Hadoop instance ("
@@ -266,5 +268,5 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
}
return homeDir;
- }
+ }
}
diff --git a/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java b/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java
index f1a16e4..9d7169e 100644
--- a/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java
+++ b/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java
@@ -178,7 +178,7 @@ public class MySqlComponent implements DatabaseComponent<ResourceComponent<?>>,
private AggregateProcessInfo findProcessInfo() {
AggregateProcessInfo result = null;
// is still running reuse
- if (aggregateProcessInfo != null && aggregateProcessInfo.isRunning()) {
+ if (aggregateProcessInfo != null && aggregateProcessInfo.freshSnapshot().isRunning()) {
result = aggregateProcessInfo;
} else {
long pid = findPID();
diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessComponent.java
index c85ec42..a53b678 100644
--- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessComponent.java
+++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessComponent.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -42,6 +42,7 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.system.AggregateProcessInfo;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot;
import org.rhq.core.system.SystemInfo;
import org.rhq.core.util.exception.ThrowableUtil;
@@ -97,7 +98,14 @@ public class ProcessComponent implements ResourceComponent, MeasurementFacet {
@Override
public AvailabilityType getAvailability() {
try {
- return getProcess().isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN;
+ // Get a fresh snapshot of the process
+ ProcessInfoSnapshot processInfoSnapshot = (this.process == null) ? null : this.process.freshSnapshot();
+ if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) {
+ this.process = getProcessForConfiguration();
+ // Safe to get prior snapshot here, we've just recreated the process info instance
+ processInfoSnapshot = (this.process == null) ? null : this.process.priorSnaphot();
+ }
+ return processInfoSnapshot.isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN;
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug("failed to get process info: " + ThrowableUtil.getAllMessages(e));
@@ -106,21 +114,6 @@ public class ProcessComponent implements ResourceComponent, MeasurementFacet {
}
}
- private ProcessInfo getProcess() throws Exception {
- if (this.process != null && this.process.isRunning()) {
- // Refresh existing ProcessInfo when underlying process is apparently running.
- // ProcessInfo may hold stale data.
- // SIGAR objects do not get updated when a process goes down.
- this.process.refresh();
- }
- if (this.process == null || !this.process.isRunning()) {
- // Create ProcessInfo for the first time or when the underlying process is no longer running.
- // When a process is no longer running we need to make a new PIQL or pid file discovery.
- this.process = getProcessForConfiguration();
- }
- return this.process;
- }
-
private ProcessInfo getProcessForConfiguration() throws Exception {
SystemInfo sysInfo = this.resourceContext.getSystemInformation();
return getProcessForConfiguration(this.type, this.pidFile, this.piql, this.fullProcessTree, sysInfo);
diff --git a/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java b/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java
index 3cbe5b2..ec518aa 100644
--- a/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java
+++ b/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,9 @@ import java.util.Set;
import net.augeas.Augeas;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
@@ -52,37 +55,62 @@ import org.rhq.core.pluginapi.util.ObjectUtil;
import org.rhq.core.system.AggregateProcessInfo;
import org.rhq.core.system.NetworkStats;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot;
+import org.rhq.core.util.exception.ThrowableUtil;
/**
* @author Greg Hinkle
*/
public class OpenSSHDComponent implements ResourceComponent, ConfigurationFacet, MeasurementFacet {
+ private static final Log log = LogFactory.getLog(OpenSSHDComponent.class);
+
private ResourceContext resourceContext;
private AggregateProcessInfo processInfo;
+ @Override
public void start(ResourceContext resourceContext) throws InvalidPluginConfigurationException, Exception {
this.resourceContext = resourceContext;
- getSSHDProcess();
+ this.processInfo = getSSHDProcess();
}
+ @Override
public void stop() {
}
+ @Override
public AvailabilityType getAvailability() {
- return (processInfo != null && processInfo.isRunning()) ? AvailabilityType.UP : AvailabilityType.DOWN;
+ try {
+ // Get a fresh snapshot of the process
+ ProcessInfoSnapshot processInfoSnapshot = (this.processInfo == null) ? null : this.processInfo
+ .freshSnapshot();
+ if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) {
+ this.processInfo = getSSHDProcess();
+ // Safe to get prior snapshot here, we've just recreated the process info instance
+ processInfoSnapshot = (this.processInfo == null) ? null : this.processInfo.priorSnaphot();
+ }
+ return (this.processInfo != null && processInfoSnapshot.isRunning()) ? AvailabilityType.UP
+ : AvailabilityType.DOWN;
+ } catch (Exception e) {
+ if (log.isDebugEnabled()) {
+ log.debug("failed to get availability: " + ThrowableUtil.getAllMessages(e));
+ }
+ return AvailabilityType.DOWN;
+ }
}
- private void getSSHDProcess() {
+ private AggregateProcessInfo getSSHDProcess() {
List<ProcessInfo> procs = resourceContext.getSystemInformation().getProcesses(
"process|basename|match=sshd,process|basename|nomatch|parent=sshd");
if (procs.size() == 1) {
- this.processInfo = procs.get(0).getAggregateProcessTree();
+ return procs.get(0).getAggregateProcessTree();
}
+ return null;
}
+ @Override
public Configuration loadResourceConfiguration() throws Exception {
Configuration pluginConfiguration = resourceContext.getPluginConfiguration();
ConfigurationDefinition resourceConfigurationDefinition = resourceContext.getResourceType()
@@ -172,8 +200,7 @@ public class OpenSSHDComponent implements ResourceComponent, ConfigurationFacet,
// This very hackish bit of code is to suport the list-of-maps standard with a single simple definition in the map
PropertyDefinitionList listDef = ((PropertyDefinitionList) p);
PropertyDefinitionMap mapDef = ((PropertyDefinitionMap) listDef.getMemberDefinition());
- PropertyDefinitionSimple simpleDef = (PropertyDefinitionSimple) mapDef.getPropertyDefinitions()
- .get(0);
+ PropertyDefinitionSimple simpleDef = (PropertyDefinitionSimple) mapDef.getPropertyDefinitions().get(0);
String name = simpleDef.getName();
List<String> allValues = new ArrayList<String>();
@@ -196,9 +223,11 @@ public class OpenSSHDComponent implements ResourceComponent, ConfigurationFacet,
return config;
}
+ @Override
public void updateResourceConfiguration(ConfigurationUpdateReport report) {
}
+ @Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
NetworkStats stats = resourceContext.getSystemInformation().getNetworkStats("localhost", 22);
processInfo.refresh();
commit d65b4e4ce17fe7ad97b8634971490395c2521261
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Jan 24 16:27:28 2013 +0100
refactoring: renaming class "ResourceResourceAgentView" to "ResourceAgentView"
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 28ca7ab..e67d697 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -65,7 +65,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configura
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigurationEditView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigurationHistoryListView;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceResourceAgentView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceAgentView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.CalltimeView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.ResourceAvailabilityView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules.ResourceSchedulesView;
@@ -384,7 +384,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
viewFactory = (!enabled) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new ResourceResourceAgentView(inventoryTab.extendLocatorId("AgentView"), resourceId);
+ return new ResourceAgentView(inventoryTab.extendLocatorId("AgentView"), resourceId);
}
};
updateSubTab(this.inventoryTab, this.inventoryAgent, true, enabled, viewFactory);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
new file mode 100644
index 0000000..5c91365
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
@@ -0,0 +1,216 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.form.fields.FormItem;
+import com.smartgwt.client.widgets.form.fields.FormItemIcon;
+import com.smartgwt.client.widgets.form.fields.HeaderItem;
+import com.smartgwt.client.widgets.form.fields.SpacerItem;
+import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+
+import org.rhq.core.domain.resource.Agent;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.RefreshableView;
+import org.rhq.enterprise.gui.coregui.client.admin.topology.AgentTableView;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
+
+/**
+ * The content pane for the Resource Inventory>Agent subtab.
+ *
+ * @author Simeon Pinder
+ */
+public class ResourceAgentView extends LocatableVLayout implements RefreshableView {
+
+ private int resourceId;
+ private LocatableDynamicForm form;
+ private StaticTextItem nameValue;
+ private StaticTextItem addressValue;
+ private StaticTextItem portValue;
+ private FormItemIcon agentStatusIcon;
+ private StaticTextItem lastAvailReportValue;
+ private StaticTextItem lastAvailPingValue;
+ private StaticTextItem endpointValue;
+ private StaticTextItem topologyViewItem;
+
+ private boolean loading = false; // will be true if loadData is currently waiting for responses
+
+ public ResourceAgentView(String locatorId, int resourceId) {
+ super(locatorId);
+
+ this.resourceId = resourceId;
+ }
+
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+
+ setLeft("10%");
+ setWidth("80%");
+
+ this.form = new LocatableDynamicForm(extendLocatorId("Agent_Info"));
+ final List<FormItem> formItems = createFormItems();
+ this.form.setItems(formItems.toArray(new FormItem[formItems.size()]));
+ loadData();
+ this.addMember(this.form);
+ }
+
+ @Override
+ public void refresh() {
+ loadData();
+ }
+
+ private List<FormItem> createFormItems() {
+ final List<FormItem> formItems = new ArrayList<FormItem>();
+ HeaderItem headerItem = new HeaderItem("header", MSG.view_inventory_summary_agent_title());
+ headerItem.setValue(MSG.view_inventory_summary_agent_title());
+ formItems.add(headerItem);
+ formItems.add(new SpacerItem());
+
+ // Name
+ nameValue = new StaticTextItem("name", MSG.common_title_name());
+ formItems.add(nameValue);
+
+ // Address
+ String address = "address";
+ addressValue = new StaticTextItem(address, MSG.common_title_address());
+ formItems.add(addressValue);
+
+ // Port
+ String port = "port";
+ portValue = new StaticTextItem(port, MSG.common_title_port());
+ formItems.add(portValue);
+
+ // Agent Status
+ agentStatusIcon = new FormItemIcon();
+ agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
+ StaticTextItem agentStatus = new StaticTextItem("agent-comm-status", MSG
+ .view_inventory_summary_agent_status_title());
+ agentStatus.setIcons(agentStatusIcon);
+ agentStatus.setWrapTitle(false);
+ formItems.add(agentStatus);
+
+ // Last Received Avail report
+ String lastAvailReport = "last-avail-report";
+ lastAvailReportValue = new StaticTextItem(lastAvailReport, MSG.view_inventory_summary_agent_last_title());
+ lastAvailReportValue.setWrapTitle(false);
+ formItems.add(lastAvailReportValue);
+
+ // Last Received Avail ping
+ lastAvailPingValue = new StaticTextItem("last-avail-ping", MSG.view_adminTopology_agent_lastAvailabilityPing());
+ lastAvailPingValue.setWrapTitle(false);
+ formItems.add(lastAvailPingValue);
+
+ // Full Endpoint
+ String fullEndpoint = "full-endpoint";
+ endpointValue = new StaticTextItem(fullEndpoint, MSG.view_inventory_summary_agent_fullEnpoint());
+ formItems.add(endpointValue);
+
+ // link to agent topology view
+ String topologyView = "topology-view";
+ topologyViewItem = new StaticTextItem("topology-view", MSG.view_admin_topology());
+ formItems.add(topologyViewItem);
+
+ return formItems;
+ }
+
+ private void loadData() {
+ if (loading) {
+ return; // we are already loading and waiting for data, no need to re-issue the same queries
+ }
+ loading = true;
+
+ GWTServiceLookup.getAgentService().getAgentForResource(this.resourceId, new AsyncCallback<Agent>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ loading = false;
+ //Permissions failure, generate message to that effect
+ for (Canvas child : form.getChildren()) {
+ child.destroy();
+ }
+
+ HeaderItem headerItem = new HeaderItem("header", MSG.view_inventory_summary_agent_title());
+ headerItem.setValue(MSG.view_inventory_summary_agent_title());
+ StaticTextItem permissionsMessage = new StaticTextItem("permissions", "permissionsFailure");
+ permissionsMessage.setShowTitle(false);
+ permissionsMessage.setValue(MSG.view_inventory_summary_agent_error3());
+ permissionsMessage.setWrap(false);
+ form.setFields(headerItem, new SpacerItem(), permissionsMessage);
+ form.markForRedraw();
+ }
+
+ @Override
+ public void onSuccess(Agent agent) {
+ GWTServiceLookup.getAgentService().pingAgentForResource(resourceId, new AsyncCallback<Boolean>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ loading = false;
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_inventory_summary_agent_error2() + " " + resourceId + ".", caught);
+ agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
+ form.markForRedraw();
+ }
+
+ @Override
+ public void onSuccess(Boolean isUp) {
+ loading = false;
+ //update icon with correct status
+ agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(isUp));
+ form.markForRedraw();
+ }
+ });
+ nameValue.setValue(agent.getName());
+ addressValue.setValue(agent.getAddress());
+ portValue.setValue(agent.getPort());
+ Long lastAvailReport = agent.getLastAvailabilityReport();
+ lastAvailReportValue.setValue((null != lastAvailReport) ? new Date(lastAvailReport) : MSG.common_val_none());
+ Long lastAvailPing = agent.getLastAvailabilityPing();
+ lastAvailPingValue.setValue((null != lastAvailPing) ? new Date(lastAvailPing) : MSG.common_val_none());
+ String remoteEndpoint = agent.getRemoteEndpoint();
+ if (remoteEndpoint != null) {
+ // some browsers (firefox in particular) won't wrap unless you put breaks in the string
+ // (EDIT: in FF 16 the wrapping works even without a space, so this could be possibly ommited)
+ remoteEndpoint = remoteEndpoint.replaceAll("&", " &");
+ } else {
+ remoteEndpoint = MSG.view_inventory_summary_agent_fullEnpoint_err1();
+ }
+ endpointValue.setValue(remoteEndpoint);
+
+ // make clickable link for agent topology view
+ String detailsUrl = "#" + AgentTableView.VIEW_PATH + "/" + agent.getId();
+ String formattedValue = StringUtility.escapeHtml(MSG.common_label_link());
+ String topologyViewItemText = SeleniumUtility.getLocatableHref(detailsUrl, formattedValue, null);
+ topologyViewItem.setValue(topologyViewItemText);
+
+ form.markForRedraw();
+ }
+ });
+ }
+
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java
deleted file mode 100644
index 478207e..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.form.fields.FormItem;
-import com.smartgwt.client.widgets.form.fields.FormItemIcon;
-import com.smartgwt.client.widgets.form.fields.HeaderItem;
-import com.smartgwt.client.widgets.form.fields.SpacerItem;
-import com.smartgwt.client.widgets.form.fields.StaticTextItem;
-
-import org.rhq.core.domain.resource.Agent;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.ImageManager;
-import org.rhq.enterprise.gui.coregui.client.RefreshableView;
-import org.rhq.enterprise.gui.coregui.client.admin.topology.AgentTableView;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
-
-/**
- * The content pane for the Resource Inventory>Agent subtab.
- *
- * @author Simeon Pinder
- */
-public class ResourceResourceAgentView extends LocatableVLayout implements RefreshableView {
-
- private int resourceId;
- private LocatableDynamicForm form;
- private StaticTextItem nameValue;
- private StaticTextItem addressValue;
- private StaticTextItem portValue;
- private FormItemIcon agentStatusIcon;
- private StaticTextItem lastAvailReportValue;
- private StaticTextItem lastAvailPingValue;
- private StaticTextItem endpointValue;
- private StaticTextItem topologyViewItem;
-
- private boolean loading = false; // will be true if loadData is currently waiting for responses
-
- public ResourceResourceAgentView(String locatorId, int resourceId) {
- super(locatorId);
-
- this.resourceId = resourceId;
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
-
- setLeft("10%");
- setWidth("80%");
-
- this.form = new LocatableDynamicForm(extendLocatorId("Agent_Info"));
- final List<FormItem> formItems = createFormItems();
- this.form.setItems(formItems.toArray(new FormItem[formItems.size()]));
- loadData();
- this.addMember(this.form);
- }
-
- @Override
- public void refresh() {
- loadData();
- }
-
- private List<FormItem> createFormItems() {
- final List<FormItem> formItems = new ArrayList<FormItem>();
- HeaderItem headerItem = new HeaderItem("header", MSG.view_inventory_summary_agent_title());
- headerItem.setValue(MSG.view_inventory_summary_agent_title());
- formItems.add(headerItem);
- formItems.add(new SpacerItem());
-
- // Name
- nameValue = new StaticTextItem("name", MSG.common_title_name());
- formItems.add(nameValue);
-
- // Address
- String address = "address";
- addressValue = new StaticTextItem(address, MSG.common_title_address());
- formItems.add(addressValue);
-
- // Port
- String port = "port";
- portValue = new StaticTextItem(port, MSG.common_title_port());
- formItems.add(portValue);
-
- // Agent Status
- agentStatusIcon = new FormItemIcon();
- agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
- StaticTextItem agentStatus = new StaticTextItem("agent-comm-status", MSG
- .view_inventory_summary_agent_status_title());
- agentStatus.setIcons(agentStatusIcon);
- agentStatus.setWrapTitle(false);
- formItems.add(agentStatus);
-
- // Last Received Avail report
- String lastAvailReport = "last-avail-report";
- lastAvailReportValue = new StaticTextItem(lastAvailReport, MSG.view_inventory_summary_agent_last_title());
- lastAvailReportValue.setWrapTitle(false);
- formItems.add(lastAvailReportValue);
-
- // Last Received Avail ping
- lastAvailPingValue = new StaticTextItem("last-avail-ping", MSG.view_adminTopology_agent_lastAvailabilityPing());
- lastAvailPingValue.setWrapTitle(false);
- formItems.add(lastAvailPingValue);
-
- // Full Endpoint
- String fullEndpoint = "full-endpoint";
- endpointValue = new StaticTextItem(fullEndpoint, MSG.view_inventory_summary_agent_fullEnpoint());
- formItems.add(endpointValue);
-
- // link to agent topology view
- String topologyView = "topology-view";
- topologyViewItem = new StaticTextItem("topology-view", MSG.view_admin_topology());
- formItems.add(topologyViewItem);
-
- return formItems;
- }
-
- private void loadData() {
- if (loading) {
- return; // we are already loading and waiting for data, no need to re-issue the same queries
- }
- loading = true;
-
- GWTServiceLookup.getAgentService().getAgentForResource(this.resourceId, new AsyncCallback<Agent>() {
- @Override
- public void onFailure(Throwable caught) {
- loading = false;
- //Permissions failure, generate message to that effect
- for (Canvas child : form.getChildren()) {
- child.destroy();
- }
-
- HeaderItem headerItem = new HeaderItem("header", MSG.view_inventory_summary_agent_title());
- headerItem.setValue(MSG.view_inventory_summary_agent_title());
- StaticTextItem permissionsMessage = new StaticTextItem("permissions", "permissionsFailure");
- permissionsMessage.setShowTitle(false);
- permissionsMessage.setValue(MSG.view_inventory_summary_agent_error3());
- permissionsMessage.setWrap(false);
- form.setFields(headerItem, new SpacerItem(), permissionsMessage);
- form.markForRedraw();
- }
-
- @Override
- public void onSuccess(Agent agent) {
- GWTServiceLookup.getAgentService().pingAgentForResource(resourceId, new AsyncCallback<Boolean>() {
- @Override
- public void onFailure(Throwable caught) {
- loading = false;
- CoreGUI.getErrorHandler().handleError(
- MSG.view_inventory_summary_agent_error2() + " " + resourceId + ".", caught);
- agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
- form.markForRedraw();
- }
-
- @Override
- public void onSuccess(Boolean isUp) {
- loading = false;
- //update icon with correct status
- agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(isUp));
- form.markForRedraw();
- }
- });
- nameValue.setValue(agent.getName());
- addressValue.setValue(agent.getAddress());
- portValue.setValue(agent.getPort());
- Long lastAvailReport = agent.getLastAvailabilityReport();
- lastAvailReportValue.setValue((null != lastAvailReport) ? new Date(lastAvailReport) : MSG.common_val_none());
- Long lastAvailPing = agent.getLastAvailabilityPing();
- lastAvailPingValue.setValue((null != lastAvailPing) ? new Date(lastAvailPing) : MSG.common_val_none());
- String remoteEndpoint = agent.getRemoteEndpoint();
- if (remoteEndpoint != null) {
- // some browsers (firefox in particular) won't wrap unless you put breaks in the string
- // (EDIT: in FF 16 the wrapping works even without a space, so this could be possibly ommited)
- remoteEndpoint = remoteEndpoint.replaceAll("&", " &");
- } else {
- remoteEndpoint = MSG.view_inventory_summary_agent_fullEnpoint_err1();
- }
- endpointValue.setValue(remoteEndpoint);
-
- // make clickable link for agent topology view
- String detailsUrl = "#" + AgentTableView.VIEW_PATH + "/" + agent.getId();
- String formattedValue = StringUtility.escapeHtml(MSG.common_label_link());
- String topologyViewItemText = SeleniumUtility.getLocatableHref(detailsUrl, formattedValue, null);
- topologyViewItem.setValue(topologyViewItemText);
-
- form.markForRedraw();
- }
- });
- }
-
-}
\ No newline at end of file
1
0