assert by op type

elastic · Oct 19, 2018 · 1df9b22 · 1df9b22
1 parent 8f19392
commit 1df9b22
Showing 1 changed file with 8 additions and 2 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
@@ -2374,8 +2374,14 @@ public void waitForOpsToComplete(long seqNo) throws InterruptedException {
      * @return true if the given operation was processed; otherwise false.
      */
     protected final boolean hasBeenProcessedBefore(Operation op) {
-        assert op.seqNo() != SequenceNumbers.UNASSIGNED_SEQ_NO : "operation is not assigned seq_no";
-        assert noOpKeyedLock.isHeldByCurrentThread(op.seqNo()) || versionMap.assertKeyedLockHeldByCurrentThread(op.uid().bytes());
+        if (Assertions.ENABLED) {
+            assert op.seqNo() != SequenceNumbers.UNASSIGNED_SEQ_NO : "operation is not assigned seq_no";
+            if (op.operationType() == Operation.TYPE.NO_OP) {
+                assert noOpKeyedLock.isHeldByCurrentThread(op.seqNo());
+            } else {
+                assert versionMap.assertKeyedLockHeldByCurrentThread(op.uid().bytes());
+            }
+        }
         return localCheckpointTracker.contains(op.seqNo());
     }