Fix NPE in IndexShard flushStats (#130809)

kingherc · kingherc · commit b2cdfc446628 · 2025-07-10T08:26:16.000Z
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
@@ -1344,11 +1344,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
`@@ -1344,11 +1344,12 @@ public RefreshStats refreshStats() {`
`1344`	`1344`	`}`
`1345`	`1345`
`1346`	`1346`	`public FlushStats flushStats() {`
	`1347`	`+ final Engine engine = getEngineOrNull();`
`1347`	`1348`	`return new FlushStats(`
`1348`	`1349`	`flushMetric.count(),`
`1349`	`1350`	`periodicFlushMetric.count(),`
`1350`	`1351`	`TimeUnit.NANOSECONDS.toMillis(flushMetric.sum()),`
`1351`		`- getEngineOrNull() != null ? getEngineOrNull().getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L`
	`1352`	`+ engine != null ? engine.getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L`
`1352`	`1353`	`);`
`1353`	`1354`	`}`
`1354`	`1355`