Core: Throw CommitStateUnknownException if RuntimeException that is n…

…ot marked as cleanable is thrown
apache · May 24, 2024 · f9fb642 · f9fb642
1 parent bd046f8
commit f9fb642
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/core/src/main/java/org/apache/iceberg/BaseTransaction.java b/core/src/main/java/org/apache/iceberg/BaseTransaction.java
@@ -333,6 +333,8 @@ private void commitCreateTransaction() {
       // the commit failed and no files were committed. clean up each update
       if (!ops.requireStrictCleanup() || e instanceof CleanableFailure) {
         cleanAllUpdates();
+      } else if (ops.requireStrictCleanup()) {
+        throw new CommitStateUnknownException(e);
       }
 
       throw e;
@@ -388,6 +390,8 @@ private void commitReplaceTransaction(boolean orCreate) {
       // the commit failed and no files were committed. clean up each update.
       if (!ops.requireStrictCleanup() || e instanceof CleanableFailure) {
         cleanAllUpdates();
+      } else if (ops.requireStrictCleanup()) {
+        throw new CommitStateUnknownException(e);
       }
 
       throw e;
@@ -436,6 +440,8 @@ private void commitSimpleTransaction() {
     } catch (RuntimeException e) {
       if (!ops.requireStrictCleanup() || e instanceof CleanableFailure) {
         cleanUpOnCommitFailure();
+      } else if (ops.requireStrictCleanup()) {
+        throw new CommitStateUnknownException(e);
       }
 
       throw e;

diff --git a/core/src/main/java/org/apache/iceberg/SnapshotProducer.java b/core/src/main/java/org/apache/iceberg/SnapshotProducer.java
@@ -415,6 +415,8 @@ public void commit() {
     } catch (RuntimeException e) {
       if (!strictCleanup || e instanceof CleanableFailure) {
         Exceptions.suppressAndThrow(e, this::cleanAll);
+      } else if (strictCleanup) {
+        throw new CommitStateUnknownException(e);
       }
 
       throw e;