Fix NPE in IndexShard flushStats

kingherc · kingherc · commit d9852993b0f6 · 2025-07-08T13:28:40.000+03: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
@@ -1370,7 +1370,7 @@ public FlushStats flushStats() {
             flushMetric.count(),
             periodicFlushMetric.count(),
             TimeUnit.NANOSECONDS.toMillis(flushMetric.sum()),
-            getEngineOrNull() != null ? getEngineOrNull().getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L
+            withEngineOrNull(engine -> engine != null ? engine.getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L)
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1370,7 +1370,7 @@ public FlushStats flushStats() {`
`1370`	`1370`	`flushMetric.count(),`
`1371`	`1371`	`periodicFlushMetric.count(),`
`1372`	`1372`	`TimeUnit.NANOSECONDS.toMillis(flushMetric.sum()),`
`1373`		`- getEngineOrNull() != null ? getEngineOrNull().getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L`
	`1373`	`+ withEngineOrNull(engine -> engine != null ? engine.getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L)`
`1374`	`1374`	`);`
`1375`	`1375`	`}`
`1376`	`1376`