(storm) branch master updated: STORM-4024 Fix Bolt Input Stats are blank if topology.acker.executors is null or 0

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git


The following commit(s) were added to refs/heads/master by this push:
     new cbca641fd STORM-4024 Fix Bolt Input Stats are blank if 
topology.acker.executors is null or 0
cbca641fd is described below

commit cbca641fd48a5828af2248aaedd5be5948cd3e8a
Author: Scott Moore <scott.mo...@viavisolutions.com>
AuthorDate: Wed Jan 24 16:15:44 2024 +0000

    STORM-4024 Fix Bolt Input Stats are blank if topology.acker.executors is 
null or 0
---
 storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java 
b/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java
index afb284267..ea0ec5891 100644
--- a/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java
+++ b/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java
@@ -150,13 +150,15 @@ public class StatsUtil {
                                                             Map<K, Double> 
id2procAvg,
                                                             Map<K, Long> 
id2numExec) {
         Map<K, Map> ret = new HashMap<>();
-        if (id2execAvg == null || id2procAvg == null || id2numExec == null) {
+        if (id2execAvg == null || id2numExec == null) {
             return ret;
         }
         for (K k : id2execAvg.keySet()) {
             Map<String, Object> subMap = new HashMap<>();
             subMap.put(EXEC_LAT_TOTAL, weightAvg(id2execAvg, id2numExec, k));
-            subMap.put(PROC_LAT_TOTAL, weightAvg(id2procAvg, id2numExec, k));
+            if (id2procAvg != null) {
+                subMap.put(PROC_LAT_TOTAL, weightAvg(id2procAvg, id2numExec, 
k));
+            }
             subMap.put(EXECUTED, id2numExec.get(k));
             ret.put(k, subMap);
         }