modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java | 67 +++++----- modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 2 2 files changed, 38 insertions(+), 31 deletions(-)
New commits: commit 6237de5acc0baa356105105d2287739d3be55fe8 Author: alexander.kiefer79@googlemail.com <di34475@.dh-com.continental.steel> Date: Tue Jul 27 16:38:36 2010 +0200
Added more logging output to make debugging easier
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java index a2eca92..f607918 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java @@ -64,52 +64,61 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
// Next discover all other services and non-top-level servers Set<Resource> servers = platform.getChildResources(); + log.info("Platform " + platform.getName() + " has " + servers.size() + " ChildResources");
- for (Resource server : servers) { + if (servers != null) { + for (Resource server : servers) { + log.info("Name of server: " + server.getName()); + log.info("Id of server: " + server.getId());
- //Check if really is of Category SERVER - if (server.getResourceType().getCategory() == ResourceCategory.SERVER) { - //check if child resource implements the interface ChildResourceTypeDiscoveryFacet - if (server instanceof ChildResourceTypeDiscoveryFacet) { + //Check if really is of Category SERVER + if (server.getResourceType().getCategory() == ResourceCategory.SERVER) { + //check if child resource implements the interface ChildResourceTypeDiscoveryFacet + if (server instanceof ChildResourceTypeDiscoveryFacet) {
- log.info("Server " + server.getName() + " is instanceof ChildResourceTypeDiscoveryFacet"); - //Get ResourceContainer for each server instance + log.info("Server " + server.getName() + " is instanceof ChildResourceTypeDiscoveryFacet"); + //Get ResourceContainer for each server instance
- ResourceContainer container = im.getResourceContainer(server.getId()); + ResourceContainer container = im.getResourceContainer(server.getId());
- log.info("Server " + server.getName() + " is runnig in ResourceContainer " + container.toString()); + log.info("Server " + server.getName() + " is running in ResourceContainer " + + container.toString());
- if (container.getResourceComponentState() != ResourceContainer.ResourceComponentState.STARTED - || container.getAvailability() == null - || container.getAvailability().getAvailabilityType() == AvailabilityType.DOWN) { - // Don't collect metrics for resources that are down - if (log.isDebugEnabled()) { - log.debug("ChildType not discoverd for inactive resource component: " + if (container.getResourceComponentState() != ResourceContainer.ResourceComponentState.STARTED + || container.getAvailability() == null + || container.getAvailability().getAvailabilityType() == AvailabilityType.DOWN) { + // Don't collect metrics for resources that are down + //if (log.isDebugEnabled()) { + log.info("ChildType not discoverd for inactive resource component: " + container.getResource()); - } - } else { + //} + } else {
- try { + try {
- ChildResourceTypeDiscoveryFacet discoveryComponent = ComponentUtil.getComponent(server - .getId(), ChildResourceTypeDiscoveryFacet.class, FacetLockType.READ, 30 * 1000, true, - true); + ChildResourceTypeDiscoveryFacet discoveryComponent = ComponentUtil.getComponent(server + .getId(), ChildResourceTypeDiscoveryFacet.class, FacetLockType.READ, 30 * 1000, + true, true);
- //get Set<ResourceType> --> all the Services which are running under the specific server - resourceTypes = discoverChildResourceTypes(discoveryComponent); + //get Set<ResourceType> --> all the Services which are running under the specific server + resourceTypes = discoverChildResourceTypes(discoveryComponent);
- //Iterate over all the ResourceTypes contained in the Set - for (ResourceType type : resourceTypes) { + //Iterate over all the ResourceTypes contained in the Set + for (ResourceType type : resourceTypes) {
- //Create a new ResourceType in the DB for the selected type - im.createNewResourceType(type.getName(), type.getName() + "Metric"); + //Create a new ResourceType in the DB for the selected type + im.createNewResourceType(type.getName(), type.getName() + "Metric"); + } + } catch (Exception e) { + throw new RuntimeException("Error submitting service scan", e); } - } catch (Exception e) { - throw new RuntimeException("Error submitting service scan", e); } } } } + + } else { + log.info("Set<ResourceType> was returned with value null"); }
return null; diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java index 64f6f10..68ea9ab 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java @@ -2428,10 +2428,8 @@ public class InventoryManager extends AgentService implements ContainerService, */ public void createNewResourceType(String resourceTypeName, String metricName) {
- log.info("createNewResourceType() called"); //Get DiscoveryServerService object to enable communication to the remote server DiscoveryServerService serverService = configuration.getServerServices().getDiscoveryServerService(); - log.info("DiscoveryServerService instance returned with values " + serverService.toString());
if (serverService != null) { //Call method to add a new ResourceType in the server DB
rhq-commits@lists.fedorahosted.org