Use getTotalFlushTimeExcludingWaitingOnLockInMillis

elastic · Apr 11, 2024 · 27ec5c5 · 27ec5c5
1 parent 4ab7771
commit 27ec5c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/engine/Engine.java b/server/src/main/java/org/elasticsearch/index/engine/Engine.java
@@ -398,7 +398,7 @@ boolean throttleLockIsHeldByCurrentThread() { // to be used in assertions and te
     /**
      * Returns the total time flushes have been executed excluding waiting on locks.
      */
-    public long getFlushTimeExcludingWaitingOnLockInMillis() {
+    public long getTotalFlushTimeExcludingWaitingOnLockInMillis() {
         return 0;
     }
 

diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -179,7 +179,7 @@ public class InternalEngine extends Engine {
     private final CounterMetric numDocDeletes = new CounterMetric();
     private final CounterMetric numDocAppends = new CounterMetric();
     private final CounterMetric numDocUpdates = new CounterMetric();
-    private final MeanMetric flushTimeExcludingWaitingOnLock = new MeanMetric();
+    private final MeanMetric totalFlushTimeExcludingWaitingOnLock = new MeanMetric();
 
     private final NumericDocValuesField softDeletesField = Lucene.newSoftDeletesField();
     private final SoftDeletesPolicy softDeletesPolicy;
@@ -2251,7 +2251,7 @@ protected void flushHoldingLock(boolean force, boolean waitIfOngoing, ActionList
             listener.onFailure(e);
             return;
         } finally {
-            flushTimeExcludingWaitingOnLock.inc(System.nanoTime() - startTime);
+            totalFlushTimeExcludingWaitingOnLock.inc(System.nanoTime() - startTime);
             flushLock.unlock();
             logger.trace("released flush lock");
         }
@@ -3073,8 +3073,8 @@ long getNumDocUpdates() {
     }
 
     @Override
-    public long getFlushTimeExcludingWaitingOnLockInMillis() {
-        return TimeUnit.NANOSECONDS.toMillis(flushTimeExcludingWaitingOnLock.sum());
+    public long getTotalFlushTimeExcludingWaitingOnLockInMillis() {
+        return TimeUnit.NANOSECONDS.toMillis(totalFlushTimeExcludingWaitingOnLock.sum());
     }
 
     @Override

diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -1311,7 +1311,7 @@ public FlushStats flushStats() {
             flushMetric.count(),
             periodicFlushMetric.count(),
             TimeUnit.NANOSECONDS.toMillis(flushMetric.sum()),
-            getEngineOrNull() != null ? getEngineOrNull().getFlushTimeExcludingWaitingOnLockInMillis() : 0L
+            getEngineOrNull() != null ? getEngineOrNull().getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L
         );
     }