Fix NPE in IndexShard flushStats (#130809) (#130992)

kingherc · web-flow · commit 8e29403e05dd · 2025-07-10T11:33:55.000+02:00
Fixes #124164
diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -1366,11 +1366,12 @@ public RefreshStats refreshStats() {
     }
 
     public FlushStats flushStats() {
+        final Engine engine = getEngineOrNull();
         return new FlushStats(
             flushMetric.count(),
             periodicFlushMetric.count(),
             TimeUnit.NANOSECONDS.toMillis(flushMetric.sum()),
-            getEngineOrNull() != null ? getEngineOrNull().getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L
+            engine != null ? engine.getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1366,11 +1366,12 @@ public RefreshStats refreshStats() {`
`1366`	`1366`	`}`
`1367`	`1367`
`1368`	`1368`	`public FlushStats flushStats() {`
	`1369`	`+ final Engine engine = getEngineOrNull();`
`1369`	`1370`	`return new FlushStats(`
`1370`	`1371`	`flushMetric.count(),`
`1371`	`1372`	`periodicFlushMetric.count(),`
`1372`	`1373`	`TimeUnit.NANOSECONDS.toMillis(flushMetric.sum()),`
`1373`		`- getEngineOrNull() != null ? getEngineOrNull().getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L`
	`1374`	`+ engine != null ? engine.getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L`
`1374`	`1375`	`);`
`1375`	`1376`	`}`
`1376`	`1377`