fix corner case issue when stop is called while a next search is sche…

…duled
elastic · Apr 14, 2020 · 7c55d35 · 7c55d35
1 parent b9512db
commit 7c55d35
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/AsyncTwoPhaseIndexer.java b/...plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/AsyncTwoPhaseIndexer.java
@@ -495,6 +495,12 @@ protected void nextSearch() {
                 logger.debug("throttling job [{}], wait for {} ({} {})", getJobId(), executionDelay, maximumRequestsPerSecond,
                         lastDocCount);
                 scheduledNextSearch = threadPool.schedule(() -> triggerNextSearch(), executionDelay, executorName);
+
+                // corner case: if for whatever reason stop() has been called meanwhile fast forward
+                if (getState().equals(IndexerState.STOPPING)) {
+                    triggerThrottledSearchNow();
+                }
+
                 return;
             }
         }