Preliminary fix for elastic#87001

danielmitterdorfer · May 11, 2023 · a9a1eb5 · a9a1eb5
1 parent a86ee38
commit a9a1eb5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...plugin/core/src/main/java/org/elasticsearch/xpack/core/DataTiersUsageTransportAction.java b/...plugin/core/src/main/java/org/elasticsearch/xpack/core/DataTiersUsageTransportAction.java
@@ -206,7 +206,8 @@ private static void aggregateDataTierShardStats(NodeStats nodeStats, Index index
                 accumulator.docCount += shardStat.getTotal().getDocs().getCount();
 
                 // Accumulate stats about started shards
-                if (node.getByShardId(shardStat.getShardId()).state() == ShardRoutingState.STARTED) {
+                ShardRouting shardRouting = node.getByShardId(shardStat.getShardId());
+                if (shardRouting != null && shardRouting.state() == ShardRoutingState.STARTED) {
                     accumulator.totalShardCount += 1;
 
                     // Accumulate stats about started primary shards