Restore advanceMaxSeqNoOfUpdatesOrDeletesOnPrimary

Author: dnhatn

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

@@ -808,6 +808,10 @@ protected long generateSeqNoForOperationOnPrimary(final Operation operation) {
         return doGenerateSeqNoForOperation(operation);
     }
 
+    protected void advanceMaxSeqNoOfUpdatesOrDeletesOnPrimary(long seqNo) {
+        advanceMaxSeqNoOfUpdatesOrDeletes(seqNo);
+    }
+
     /**
      * Generate the sequence number for the specified operation.
      *
@@ -873,7 +877,7 @@ public IndexResult index(Index index) throws IOException {
 
                         final boolean toAppend = plan.indexIntoLucene && plan.useLuceneUpdateDocument == false;
                         if (toAppend == false) {
-                            advanceMaxSeqNoOfUpdatesOrDeletes(index.seqNo());
+                            advanceMaxSeqNoOfUpdatesOrDeletesOnPrimary(index.seqNo());
                         }
                     } else {
                         markSeqNoAsSeen(index.seqNo());
@@ -1242,7 +1246,7 @@ public DeleteResult delete(Delete delete) throws IOException {
                         delete.primaryTerm(), delete.version(), delete.versionType(), delete.origin(), delete.startTime(),
                         delete.getIfSeqNo(), delete.getIfPrimaryTerm());
 
-                    advanceMaxSeqNoOfUpdatesOrDeletes(delete.seqNo());
+                    advanceMaxSeqNoOfUpdatesOrDeletesOnPrimary(delete.seqNo());
                 } else {
                     markSeqNoAsSeen(delete.seqNo());
                 }

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java

@@ -131,6 +131,12 @@ protected long generateSeqNoForOperationOnPrimary(final Operation operation) {
         return operation.seqNo();
     }
 
+    @Override
+    protected void advanceMaxSeqNoOfUpdatesOrDeletesOnPrimary(long seqNo) {
+        assert getMaxSeqNoOfUpdatesOrDeletes() >= seqNo : seqNo + " < " + getMaxSeqNoOfUpdatesOrDeletes();
+        super.advanceMaxSeqNoOfUpdatesOrDeletesOnPrimary(seqNo); // extra safe in production code
+    }
+
     @Override
     public int fillSeqNoGaps(long primaryTerm) throws IOException {
         // a noop implementation, because follow shard does not own the history but the leader shard does.