Fixing the summary serialization issue for cache RCAs (#348)

* Fixing the summary serialization issue for cache RCAs
opendistro-for-elasticsearch · Aug 6, 2020 · 7be6969 · 7be6969
1 parent acfe086
commit 7be6969
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...n/opendistro/elasticsearch/performanceanalyzer/rca/store/rca/cache/FieldDataCacheRca.java b/...n/opendistro/elasticsearch/performanceanalyzer/rca/store/rca/cache/FieldDataCacheRca.java
@@ -112,21 +112,19 @@ public ResourceFlowUnit<HotNodeSummary> operate() {
         cacheEvictionCollector.collect(currTimestamp);
         if (counter >= rcaPeriod) {
             ResourceContext context;
-            HotNodeSummary nodeSummary;
-
             InstanceDetails instanceDetails = getInstanceDetails();
+            HotNodeSummary nodeSummary = new HotNodeSummary(instanceDetails.getInstanceId(), instanceDetails.getInstanceIp());
+
             double fieldDataCacheMaxSizeInBytes = getCacheMaxSize(
                     getAppContext(), new NodeKey(instanceDetails), ResourceUtil.FIELD_DATA_CACHE_MAX_SIZE);
             Boolean exceedsSizeThreshold = isSizeThresholdExceeded(
                     fieldDataCacheSizeGroupByOperation, fieldDataCacheMaxSizeInBytes, cacheSizeThreshold);
             if (cacheEvictionCollector.isUnhealthy(currTimestamp) && exceedsSizeThreshold) {
                 context = new ResourceContext(Resources.State.UNHEALTHY);
-                nodeSummary = new HotNodeSummary(instanceDetails.getInstanceId(), instanceDetails.getInstanceIp());
                 nodeSummary.appendNestedSummary(cacheEvictionCollector.generateSummary(currTimestamp));
             }
             else {
                 context = new ResourceContext(Resources.State.HEALTHY);
-                nodeSummary = null;
             }
 
             counter = 0;

diff --git a/...pendistro/elasticsearch/performanceanalyzer/rca/store/rca/cache/ShardRequestCacheRca.java b/...pendistro/elasticsearch/performanceanalyzer/rca/store/rca/cache/ShardRequestCacheRca.java
@@ -124,9 +124,9 @@ public ResourceFlowUnit operate() {
         cacheHitCollector.collect(currTimestamp);
         if (counter >= rcaPeriod) {
             ResourceContext context;
-            HotNodeSummary nodeSummary;
-
             InstanceDetails instanceDetails = getInstanceDetails();
+            HotNodeSummary nodeSummary = new HotNodeSummary(instanceDetails.getInstanceId(), instanceDetails.getInstanceIp());
+
             double shardRequestCacheMaxSizeInBytes = getCacheMaxSize(
                     getAppContext(), new NodeKey(instanceDetails), ResourceUtil.SHARD_REQUEST_CACHE_MAX_SIZE);
             Boolean exceedsSizeThreshold = isSizeThresholdExceeded(
@@ -138,11 +138,9 @@ public ResourceFlowUnit operate() {
                     && cacheHitCollector.isUnhealthy(currTimestamp)
                     && exceedsSizeThreshold) {
                 context = new ResourceContext(Resources.State.UNHEALTHY);
-                nodeSummary = new HotNodeSummary(instanceDetails.getInstanceId(), instanceDetails.getInstanceIp());
                 nodeSummary.appendNestedSummary(cacheEvictionCollector.generateSummary(currTimestamp));
             } else {
                 context = new ResourceContext(Resources.State.HEALTHY);
-                nodeSummary = null;
             }
 
             counter = 0;