modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
| 13 +++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 48e4935032580df80acf83838f24eae55cb8c97d
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 19 14:03:24 2013 -0500
Add a little more logging to get a better start/end of a sync.
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 24dcb44..6bdbede 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
@@ -1228,10 +1228,12 @@ public class InventoryManager extends AgentService implements
ContainerService,
Collection<ResourceSyncInfo> syncInfos = platformSyncInfo.getServices();
syncInfos.add(platformResourceSyncInfo);
- log.info("Sync Starting: Platform [" +
platformSyncInfo.getPlatform().getId() + "] and top level services.");
+ log.info("Sync Starting: Platform [" +
platformSyncInfo.getPlatform().getId() + "]");
+
+ log.info("Sync Starting: Platform Top level services [" +
platformSyncInfo.getPlatform().getId() + "]");
hadSyncedResources = syncResources(platformResourceSyncInfo.getId(), syncInfos)
|| hadSyncedResources;
- log.info("Sync Complete: Platform [" +
platformSyncInfo.getPlatform().getId() + "]. Local inventory changed: ["
- + hadSyncedResources + "]");
+ log.info("Sync Complete: Platform Top level services [" +
platformSyncInfo.getPlatform().getId()
+ + "] Local inventory changed: [" + hadSyncedResources +
"]");
syncInfos = null; // release to GC
@@ -1257,6 +1259,8 @@ public class InventoryManager extends AgentService implements
ContainerService,
purgeObsoleteResources(allServerSideUuids);
+ log.info("Sync Complete: Platform [" +
platformSyncInfo.getPlatform().getId() + "].");
+
// If we synced any Resources, one or more Resource components were probably
started, request a
// full avail report to make sure their availabilities are determined on the next
avail run (typically
// < 30s away). A full avail report will ensure an initial avail check is
performed for a resource.
@@ -1271,6 +1275,9 @@ public class InventoryManager extends AgentService implements
ContainerService,
// time the upgrade kicks in..
if (hadSyncedResources && !isResourceUpgradeActive()) {
+ log.info("Sync changes detected, requesting full availability report and
service discovery: Platform ["
+ + platformSyncInfo.getPlatform().getId() + "]");
+
// TODO: If someday this is undesirable for scalability reasons, we could
probably instead call
// requestAvailabilityCheck on each unknown or modified resource.
requestFullAvailabilityReport();
Show replies by date