Attachment 832060 Details for Bug 1037616 – Patch described

[patch] Patch described

Avail_Get_Current.patch (text/plain), 7.47 KB, created by Heiko W. Rupp on 2013-12-03 13:36:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Heiko W. Rupp

Created: 2013-12-03 13:36:25 UTC

Size: 7.47 KB

patch

obsolete

>diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
>index 76fe117..e3aee5d 100644
>--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
>+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
>@@ -25,6 +25,7 @@ import java.util.Date;
> import java.util.HashMap;
> import java.util.Iterator;
> import java.util.List;
>+import java.util.Map;
> 
> import javax.ejb.EJB;
> import javax.ejb.Stateless;
>@@ -96,6 +97,9 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
>         int mergeBatchSize = 200;
>         try {
>             mergeBatchSize = Integer.parseInt(System.getProperty("rhq.server.availability.merge.batch.size", "200"));
>+            if (mergeBatchSize>999) {
>+                mergeBatchSize = 999;
>+            }
>         } catch (Throwable t) {
>             //
>         }
>@@ -814,24 +818,56 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
>         Query q = entityManager.createNamedQuery(Availability.FIND_CURRENT_BY_RESOURCE);
>         int count = 0;
> 
>+        Map<Integer,Availability> latestAvailabilities = Collections.emptyMap();
>+        Map<Integer,ResourceAvailability> latestRAvailabilities = Collections.emptyMap();
>+        if (availabilities.size() < 1000 ) { // Actually that is true if MERGE_BATCH_SIZE above is < 1000
>+            List<Integer> resourceIds = new ArrayList<Integer>(availabilities.size());
>+            for (Availability reported : availabilities) {
>+                resourceIds.add(reported.getResource().getId());
>+            }
>+
>+            Query q2 = entityManager.createQuery("Select a from Availability a WHERE a.resource.id IN (:resources) AND a.endTime IS NULL");
>+            q2.setParameter("resources",resourceIds);
>+            List<Availability> tmp = q2.getResultList();
>+            latestAvailabilities = new HashMap<Integer, Availability>(availabilities.size());
>+            for (Availability a : tmp) {
>+                latestAvailabilities.put(a.getResource().getId(),a);
>+            }
>+
>+            Query q3 = entityManager.createQuery("SELECT ra FROM ResourceAvailability ra WHERE ra.resourceId IN (:resourceIds)");
>+            q3.setParameter("resourceIds",resourceIds);
>+            List<ResourceAvailability> tmp3 = q3.getResultList();
>+            latestRAvailabilities = new HashMap<Integer, ResourceAvailability>(availabilities.size());
>+            for (ResourceAvailability ra : tmp3) {
>+                latestRAvailabilities.put(ra.getResource().getId(),ra);
>+            }
>+
>+        }
>+
>+
>         for (Availability reported : availabilities) {
> 
>             // availability reports only tell us the current state at the start time; end time is ignored/must be null
>             reported.setEndTime(null);
> 
>             // get the latest avail for the reported resource
>-            q.setParameter("resourceId", reported.getResource().getId());
>+            int resourceId = reported.getResource().getId();
>+            q.setParameter("resourceId", resourceId);
>             Availability latest = null;
> 
>             try {
>-                latest = (Availability) q.getSingleResult();
>+                if (latestAvailabilities.containsKey(resourceId)) {
>+                    latest = latestAvailabilities.get(resourceId);
>+                } else {
>+                    latest = (Availability) q.getSingleResult();
>+                }
> 
>             } catch (NoResultException nre) {
>                 // This should not happen unless the Resource in the report is stale, which can happen in certain
>                 // sync scenarios. A Resource is given its initial Availability/ResourceAvailability when it is
>                 // persisted so it is guaranteed to have Availability, so, the Resource must not exist. At least
>                 // it must not exist in my utopian view of the world. Let's just make sure...
>-                Resource attachedResource = entityManager.find(Resource.class, reported.getResource().getId());
>+                Resource attachedResource = entityManager.find(Resource.class, resourceId);
> 
>                 if ((null == attachedResource) || (InventoryStatus.COMMITTED != attachedResource.getInventoryStatus())) {
>                     // expected case
>@@ -850,7 +886,6 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
> 
>                     try {
>                         List<Availability> attachedAvails = attachedResource.getAvailability();
>-                        Availability attachedLastAvail = null;
> 
>                         if (attachedAvails.isEmpty()) {
>                             latest = new Availability(attachedResource, 0L, AvailabilityType.UNKNOWN);
>@@ -862,7 +897,7 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
>                             latest = entityManager.merge(latest);
>                         }
> 
>-                        updateResourceAvailability(latest);
>+                        updateResourceAvailability(latest, latestRAvailabilities);
> 
>                         // ask the agent for a full report so as to ensure we are in sync with agent
>                         mergeInfo.setAskForFullReport(true);
>@@ -895,7 +930,7 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
>                     }
> 
>                     latest = latestList.get(latestCount - 1);
>-                    updateResourceAvailability(latest);
>+                    updateResourceAvailability(latest, latestRAvailabilities);
> 
>                     // this is an unusual report - ask the agent for a full report so as to ensure we are in sync with agent
>                     mergeInfo.setAskForFullReport(true);
>@@ -932,7 +967,7 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
>                     latest.setEndTime(reported.getStartTime());
>                     latest = entityManager.merge(latest);
> 
>-                    updateResourceAvailability(reported);
>+                    updateResourceAvailability(reported, latestRAvailabilities);
>                 }
> 
>                 // our last known state was unknown, ask for a full report to ensure we are in sync with agent
>@@ -961,10 +996,16 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
>         return;
>     }
> 
>-    private void updateResourceAvailability(Availability reported) {
>+    private void updateResourceAvailability(Availability reported, Map<Integer, ResourceAvailability> availabilityMap) {
>         // update the last known availability data for this resource
>-        ResourceAvailability currentAvailability = resourceAvailabilityManager.getLatestAvailability(reported
>-            .getResource().getId());
>+        ResourceAvailability currentAvailability;
>+        int resourceId = reported
>+            .getResource().getId();
>+        if (availabilityMap.containsKey(resourceId)) {
>+            currentAvailability = availabilityMap.get(resourceId);
>+        } else {
>+            currentAvailability = resourceAvailabilityManager.getLatestAvailability(resourceId);
>+        }
> 
>         if (currentAvailability != null && currentAvailability.getAvailabilityType() != reported.getAvailabilityType()) {
>             // but only update the record if necessary (if the AvailabilityType changed)

Actions: View | Diff

Attachments on bug 1037616: 832060