null check to calm spot check tests

Signed-off-by: Kiran Prakash <[email protected]>
opensearch-project · Sep 29, 2022 · 9923e46 · 9923e46
1 parent fa303f6
commit 9923e46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/...in/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java b/...in/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java
@@ -7,10 +7,7 @@
 
 
 import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
@@ -77,8 +74,10 @@ public Decision operate() {
         counter = 0;
 
         for (final ResourceEnum cacheType : modifyCacheActionPriorityList) {
-            getActionsFromRca(cacheTypeBaseClusterRcaMap.get(cacheType), impactedNodes)
-                    .forEach(decision::addAction);
+            BaseClusterRca baseClusterRcaMap = cacheTypeBaseClusterRcaMap.get(cacheType);
+            if (baseClusterRcaMap == null)
+                continue;
+            getActionsFromRca(baseClusterRcaMap, impactedNodes).forEach(decision::addAction);
         }
         return decision;
     }

diff --git a/src/main/java/org/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregator.java
@@ -203,7 +203,7 @@ public boolean isMeasurementObserved(MeasurementSet toFind) {
         if (statistics == null) {
             return false;
         }
-        for (IStatistic statistic : statMap.get(toFind)) {
+        for (IStatistic statistic : statistics) {
             if (statistic != null && !statistic.isEmpty()) {
                 return true;
             }