lookup the existing term

elastic · Oct 19, 2018 · 8f19392 · 8f19392
1 parent 40fb87e
commit 8f19392
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -1460,7 +1460,7 @@ private NoOpResult innerNoOp(final NoOp noOp) throws IOException {
      * Executes a pre-flight check for a given NoOp.
      * If this method returns a non-empty result, the engine won't process this NoOp and returns a failure.
      */
-    protected Optional<Exception> preFlightCheckForNoOp(final NoOp noOp) {
+    protected Optional<Exception> preFlightCheckForNoOp(final NoOp noOp) throws IOException {
         return Optional.empty();
     }
 

diff --git a/...ck/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java b/...ck/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java
@@ -112,10 +112,11 @@ protected InternalEngine.DeletionStrategy deletionStrategyForOperation(final Del
     }
 
     @Override
-    protected Optional<Exception> preFlightCheckForNoOp(NoOp noOp) {
+    protected Optional<Exception> preFlightCheckForNoOp(NoOp noOp) throws IOException {
         if (noOp.origin() == Operation.Origin.PRIMARY && hasBeenProcessedBefore(noOp)) {
             // See the comment in #indexingStrategyForOperation for the explanation why we can safely skip this operation.
-            return Optional.of(new AlreadyProcessedFollowingEngineException(shardId, noOp.seqNo()));
+            final OptionalLong existingTerm = lookupPrimaryTerm(noOp.seqNo());
+            return Optional.of(new AlreadyProcessedFollowingEngineException(shardId, noOp.seqNo(), existingTerm));
         } else {
             return super.preFlightCheckForNoOp(noOp);
         }