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

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