[storm] branch master updated: STORM-3572 prevent NPEs when doing visualization with restarting executors

[agresch]

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

agresch 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 5b89af3  STORM-3572 prevent NPEs when doing visualization with 
restarting executors
     new 3fb289b  Merge pull request #3202 from agresch/agresch_storm_3572
5b89af3 is described below

commit 5b89af3d4430483ef40f9fec7cdf960e3647059e
Author: Aaron Gresch <agre...@yahoo-inc.com>
AuthorDate: Fri Jan 31 16:31:13 2020 -0600

    STORM-3572 prevent NPEs when doing visualization with restarting executors
---
 storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java    | 6 ++++++
 .../java/org/apache/storm/daemon/ui/resources/StormApiResource.java | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

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 79d8046..acca1f9 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
@@ -830,6 +830,9 @@ public class StatsUtil {
         Map<String, Map<K, Double>> ret = new HashMap<>();
 
         Map<String, Map<K, List>> expands = expandAveragesSeq(avgSeq, 
countSeq);
+        if (expands == null) {
+            return ret;
+        }
         for (Map.Entry<String, Map<K, List>> entry : expands.entrySet()) {
             String k = entry.getKey();
 
@@ -2305,6 +2308,9 @@ public class StatsUtil {
                 initVal = mergeWithAddPair(initVal, expandAverages(avg, 
count));
             }
         }
+        if (initVal == null) {
+            initVal = new HashMap<>();
+        }
         return initVal;
     }
 
diff --git 
a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/resources/StormApiResource.java
 
b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/resources/StormApiResource.java
index 3cbff1c..c13a4c3 100644
--- 
a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/resources/StormApiResource.java
+++ 
b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/resources/StormApiResource.java
@@ -214,7 +214,7 @@ public class StormApiResource {
     }
 
     /**
-     * /api/v1/supervisor/summary -> topo history.
+     * /api/v1/supervisor/summary -> supervisor summary.
      */
     @GET
     @Path("/supervisor/summary")
@@ -402,6 +402,9 @@ public class StormApiResource {
                     UIHelpers.getVisualizationData(nimbusClient.getClient(), 
window, id, sys),
                     callback
             );
+        } catch (RuntimeException e) {
+            LOG.error("Failure getting topology visualization", e);
+            throw e;
         }
     }