[ML] Fix solution for preventing race conditions between timeout and completion (#10740)

lhotari · web-flow · commit 0237580fde09 · 2021-05-28T21:25:38.000+02:00
- solution was added in #4455
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java
@@ -253,7 +253,7 @@ private void updateLatency() {
      */
     private boolean checkAndCompleteOp(Object ctx) {
         long addOpCount = (ctx instanceof Long) ? (long) ctx : -1;
-        if (addOpCount != -1 && ADD_OP_COUNT_UPDATER.compareAndSet(this, this.addOpCount, -1)) {
+        if (addOpCount != -1 && ADD_OP_COUNT_UPDATER.compareAndSet(this, addOpCount, -1)) {
             return true;
         }
         log.info("Add-entry already completed for {}-{}", ledger != null ? ledger.getId() : -1, entryId);

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ private void updateLatency() {`
`253`	`253`	`*/`
`254`	`254`	`private boolean checkAndCompleteOp(Object ctx) {`
`255`	`255`	`long addOpCount = (ctx instanceof Long) ? (long) ctx : -1;`
`256`		`- if (addOpCount != -1 && ADD_OP_COUNT_UPDATER.compareAndSet(this, this.addOpCount, -1)) {`
	`256`	`+ if (addOpCount != -1 && ADD_OP_COUNT_UPDATER.compareAndSet(this, addOpCount, -1)) {`
`257`	`257`	`return true;`
`258`	`258`	`}`
`259`	`259`	`log.info("Add-entry already completed for {}-{}", ledger != null ? ledger.getId() : -1, entryId);`