Add null check for shard stats to data tier telemetry (elastic#75185) (…

…elastic#75387) This adds a null check, as `getShardStats(index)` may return null. Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
jkakavas · Jul 15, 2021 · ec4c7cf · ec4c7cf
1 parent 10a1204
commit ec4c7cf
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/DataTiersFeatureSet.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/DataTiersFeatureSet.java
@@ -11,6 +11,7 @@
 import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
 import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
 import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
+import org.elasticsearch.action.admin.indices.stats.IndexShardStats;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.node.DiscoveryNodeRole;
@@ -117,16 +118,19 @@ private DataTiersFeatureSetUsage.TierSpecificStats calculateStats(List<NodeStats
                     .collect(Collectors.toSet());
                 indexCount += indicesOnNode.size();
                 indicesOnNode.forEach(index -> {
-                    nodeStats.getIndices().getShardStats(index).stream()
-                        .filter(shardStats -> shardStats.getPrimary().getStore() != null)
-                        .forEach(shardStats -> {
-                            StoreStats primaryStoreStats = shardStats.getPrimary().getStore();
-                            // If storeStats is null, it means this is not a replica
-                            primaryShardCount.incrementAndGet();
-                            long primarySize = primaryStoreStats.getSizeInBytes();
-                            primaryByteCount.addAndGet(primarySize);
-                            valueSketch.add(primarySize);
-                        });
+                    final List<IndexShardStats> allShardStats = nodeStats.getIndices().getShardStats(index);
+                    if (allShardStats != null) {
+                        allShardStats.stream()
+                            .filter(shardStats -> shardStats.getPrimary().getStore() != null)
+                            .forEach(shardStats -> {
+                                StoreStats primaryStoreStats = shardStats.getPrimary().getStore();
+                                // If storeStats is null, it means this is not a replica
+                                primaryShardCount.incrementAndGet();
+                                long primarySize = primaryStoreStats.getSizeInBytes();
+                                primaryByteCount.addAndGet(primarySize);
+                                valueSketch.add(primarySize);
+                            });
+                    }
                 });
             }
         }