lookup the existing term

dnhatn · dnhatn · commit 8f193929a35e · 2018-10-19T15:24:14.000-04:00
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/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java b/x-pack/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);
         }

Original file line number	Diff line number	Diff line change
`@@ -1460,7 +1460,7 @@ private NoOpResult innerNoOp(final NoOp noOp) throws IOException {`
`1460`	`1460`	`* Executes a pre-flight check for a given NoOp.`
`1461`	`1461`	`* If this method returns a non-empty result, the engine won't process this NoOp and returns a failure.`
`1462`	`1462`	`*/`
`1463`		`- protected Optional<Exception> preFlightCheckForNoOp(final NoOp noOp) {`
	`1463`	`+ protected Optional<Exception> preFlightCheckForNoOp(final NoOp noOp) throws IOException {`
`1464`	`1464`	`return Optional.empty();`
`1465`	`1465`	`}`
`1466`	`1466`
Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,11 @@ protected InternalEngine.DeletionStrategy deletionStrategyForOperation(final Del`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`@Override`
`115`		`- protected Optional<Exception> preFlightCheckForNoOp(NoOp noOp) {`
	`115`	`+ protected Optional<Exception> preFlightCheckForNoOp(NoOp noOp) throws IOException {`
`116`	`116`	`if (noOp.origin() == Operation.Origin.PRIMARY && hasBeenProcessedBefore(noOp)) {`
`117`	`117`	`// See the comment in #indexingStrategyForOperation for the explanation why we can safely skip this operation.`
`118`		`- return Optional.of(new AlreadyProcessedFollowingEngineException(shardId, noOp.seqNo()));`
	`118`	`+ final OptionalLong existingTerm = lookupPrimaryTerm(noOp.seqNo());`
	`119`	`+ return Optional.of(new AlreadyProcessedFollowingEngineException(shardId, noOp.seqNo(), existingTerm));`
`119`	`120`	`} else {`
`120`	`121`	`return super.preFlightCheckForNoOp(noOp);`
`121`	`122`	`}`