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

kingherc · web-flow · commit a55638748ccf · 2025-07-10T11:31:58.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
@@ -1335,11 +1335,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
`@@ -1335,11 +1335,12 @@ public RefreshStats refreshStats() {`
`1335`	`1335`	`}`
`1336`	`1336`
`1337`	`1337`	`public FlushStats flushStats() {`
	`1338`	`+ final Engine engine = getEngineOrNull();`
`1338`	`1339`	`return new FlushStats(`
`1339`	`1340`	`flushMetric.count(),`
`1340`	`1341`	`periodicFlushMetric.count(),`
`1341`	`1342`	`TimeUnit.NANOSECONDS.toMillis(flushMetric.sum()),`
`1342`		`- getEngineOrNull() != null ? getEngineOrNull().getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L`
	`1343`	`+ engine != null ? engine.getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L`
`1343`	`1344`	`);`
`1344`	`1345`	`}`
`1345`	`1346`