[AMORO-3410] cancel renew procedure after releasing block (#3421)

* issue_3410 cancel renew procedure after releasing block * fix checkstyle
apache · Feb 10, 2025 · 9bfe609 · 9bfe609
1 parent a922fe8
commit 9bfe609
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/...format-iceberg/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java b/...format-iceberg/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java
@@ -68,6 +68,11 @@ public void release(Blocker blocker) {
     } catch (TException e) {
       throw new IllegalStateException(
           "failed to release " + tableIdentifier + "'s blocker " + blocker.blockerId(), e);
+    } finally {
+      // Regardless of whether the lock was successfully released, we will no longer renew the lock.
+      if (blocker instanceof RenewableBlocker) {
+        ((RenewableBlocker) blocker).cancelRenew();
+      }
     }
   }
 

diff --git a/amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java b/amoro-format-iceberg/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java
@@ -21,6 +21,7 @@
 import org.apache.amoro.AmsClient;
 import org.apache.amoro.api.BlockableOperation;
 import org.apache.amoro.api.NoSuchObjectException;
+import org.apache.amoro.shade.guava32.com.google.common.annotations.VisibleForTesting;
 import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions;
 import org.apache.amoro.shade.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.amoro.table.TableIdentifier;
@@ -103,6 +104,11 @@ public void renewAsync() {
             .scheduleAtFixedRate(this::doRenew, interval, interval, TimeUnit.MILLISECONDS);
   }
 
+  @VisibleForTesting
+  public ScheduledFuture getRenewTaskFuture() {
+    return this.renewTaskFuture;
+  }
+
   private void doRenew() {
     try {
       this.expirationTime =

diff --git a/...at-iceberg/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java b/...at-iceberg/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java
@@ -54,7 +54,9 @@ public void testBlockAndRelease() throws OperationConflictException {
     BasicTableBlockerManager blockerManager = (BasicTableBlockerManager) tableBlockerManager;
 
     Blocker block = blockerManager.block(OPERATIONS);
+    Assert.assertTrue(block instanceof RenewableBlocker);
 
     blockerManager.release(block);
+    Assert.assertTrue(((RenewableBlocker) block).getRenewTaskFuture() == null);
   }
 }