Add community PR 10613

Author: phsm

debian/patches/community-PR10613.patch

@@ -0,0 +1,40 @@
+diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java b/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java
+index 6025a41d69..e73587306e 100644
+--- a/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java
++++ b/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java
+@@ -768,19 +768,15 @@ public class MetricsServiceImpl extends MutualExclusiveIdsManagerBase implements
+             List<Ternary<Long, Long, Long>> cpuList = new ArrayList<>();
+             List<Ternary<Long, Long, Long>> memoryList = new ArrayList<>();
+ 
+-            for (final Host host: hostDao.findByClusterId(clusterId)) {
+-                if (host == null || host.getType() != Host.Type.Routing) {
+-                    continue;
+-                }
++            for (final HostJoinVO host: hostJoinDao.findByClusterId(clusterId, Host.Type.Routing)) {
+                 if (host.getStatus() == Status.Up) {
+                     hostMetrics.incrUpResources();
+                 }
+                 hostMetrics.incrTotalResources();
+-                HostJoinVO hostJoin = hostJoinDao.findById(host.getId());
+-                updateHostMetrics(hostMetrics, hostJoin);
++                updateHostMetrics(hostMetrics, host);
+ 
+-                cpuList.add(new Ternary<>(hostJoin.getCpuUsedCapacity(), hostJoin.getCpuReservedCapacity(), hostJoin.getCpus() * hostJoin.getSpeed()));
+-                memoryList.add(new Ternary<>(hostJoin.getMemUsedCapacity(), hostJoin.getMemReservedCapacity(), hostJoin.getTotalMemory()));
++                cpuList.add(new Ternary<>(host.getCpuUsedCapacity(), host.getCpuReservedCapacity(), host.getCpus() * host.getSpeed()));
++                memoryList.add(new Ternary<>(host.getMemUsedCapacity(), host.getMemReservedCapacity(), host.getTotalMemory()));
+             }
+ 
+             try {
+@@ -953,10 +949,7 @@ public class MetricsServiceImpl extends MutualExclusiveIdsManagerBase implements
+                     hostMetrics.incrUpResources();
+                 }
+ 
+-                for (final Host host: hostDao.findByClusterId(cluster.getId())) {
+-                    if (host == null || host.getType() != Host.Type.Routing) {
+-                        continue;
+-                    }
++                for (final HostJoinVO host: hostJoinDao.findByClusterId(cluster.getId(), Host.Type.Routing)) {
+                     updateHostMetrics(hostMetrics, hostJoinDao.findById(host.getId()));
+                 }
+             }

debian/patches/series

@@ -17,3 +17,8 @@ community-PR10254.patch
 # Merged into 4.20.1
 # Fixes: PCS-2300
 community-PR10450.patch
+
+# pullrequestreview-2713252214 - enhancement: Optimize listZonesMetrics and listClustersMetrics call performance
+# Not merged yet
+# Fixes: PCS-2382
+community-PR10613.patch