ES-10826

Author: tlrx

server/src/main/java/org/elasticsearch/index/engine/Engine.java

@@ -1300,7 +1300,7 @@ public void flush(boolean force, boolean waitIfOngoing) throws EngineException {
      */
     public final void flush(boolean force, boolean waitIfOngoing, ActionListener<FlushResult> listener) throws EngineException {
         try (var ignored = acquireEnsureOpenRef()) {
-            flushHoldingLock(force, waitIfOngoing, listener);
+            flushHoldingLock(force, waitIfOngoing, false, listener);
         }
     }
 
@@ -1309,7 +1309,7 @@ public final void flush(boolean force, boolean waitIfOngoing, ActionListener<Flu
      * the engine remains open, or holding {@code IndexShard#engineMutex} while closing the engine.
      *
      */
-    protected abstract void flushHoldingLock(boolean force, boolean waitIfOngoing, ActionListener<FlushResult> listener)
+    protected abstract void flushHoldingLock(boolean force, boolean waitIfOngoing, boolean closing, ActionListener<FlushResult> listener)
         throws EngineException;
 
     /**
@@ -2058,7 +2058,7 @@ public void flushAndClose() throws IOException {
                 logger.debug("flushing shard on close - this might take some time to sync files to disk");
                 try {
                     // TODO: We are not waiting for full durability here atm because we are on the cluster state update thread
-                    flushHoldingLock(false, false, ActionListener.noop());
+                    flushHoldingLock(false, false, true, ActionListener.noop());
                 } catch (AlreadyClosedException ex) {
                     logger.debug("engine already closed - skipping flushAndClose");
                 }
@@ -2347,7 +2347,7 @@ public record FlushResult(boolean flushPerformed, long generation) {
      * in-progress operations and listeners (e.g., primary term and generation listeners).
      * At the moment, this is implemented in serverless for a special case that ensures the engine is prepared for reset.
      */
-    public void prepareForEngineReset() throws IOException {
+    public void beforeReset() throws IOException {
         throw new UnsupportedOperationException("does not support engine reset");
     }
 

server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java

@@ -2179,7 +2179,8 @@ private boolean shouldPeriodicallyFlush(long flushThresholdSizeInBytes, long flu
     }
 
     @Override
-    protected void flushHoldingLock(boolean force, boolean waitIfOngoing, ActionListener<FlushResult> listener) throws EngineException {
+    protected void flushHoldingLock(boolean force, boolean waitIfOngoing, boolean closing, ActionListener<FlushResult> listener)
+        throws EngineException {
         ensureOpen(); // best-effort, a concurrent failEngine() can still happen but that's ok
         if (force && waitIfOngoing == false) {
             final String message = "wait_if_ongoing must be true for a force flush: force=" + force + " wait_if_ongoing=" + waitIfOngoing;
@@ -2227,8 +2228,11 @@ protected void flushHoldingLock(boolean force, boolean waitIfOngoing, ActionList
                     preCommitSegmentGeneration.set(lastCommittedSegmentInfos.getGeneration() + 1);
                     commitIndexWriter(indexWriter, translog);
                     logger.trace("finished commit for flush");
-                    // we need to refresh in order to clear older version values
-                    refresh("version_table_flush", SearcherScope.INTERNAL, true);
+                    // Only refresh if we are not closing
+                    if (closing == false) {
+                        // we need to refresh in order to clear older version values
+                        refresh("version_table_flush", SearcherScope.INTERNAL, true);
+                    }
                     translog.trimUnreferencedReaders();
                     // Update the translog location for flushListener if (1) the writeLocation has changed during the flush and
                     // (2) indexWriter has committed all the changes (checks must be done in this order).

server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java

@@ -458,7 +458,8 @@ public boolean shouldPeriodicallyFlush() {
     }
 
     @Override
-    protected void flushHoldingLock(boolean force, boolean waitIfOngoing, ActionListener<FlushResult> listener) throws EngineException {
+    protected void flushHoldingLock(boolean force, boolean waitIfOngoing, boolean closing, ActionListener<FlushResult> listener)
+        throws EngineException {
         listener.onResponse(new FlushResult(true, lastCommittedSegmentInfos.getGeneration()));
     }