update

apache · Jul 6, 2023 · 18483e3 · 18483e3
1 parent dee09f0
commit 18483e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/src/main/java/org/apache/iceberg/actions/BaseCommitService.java b/core/src/main/java/org/apache/iceberg/actions/BaseCommitService.java
@@ -173,9 +173,11 @@ public void close() {
       // be only a single commit operation.
       if (!committerService.awaitTermination(timeoutInMS, TimeUnit.MILLISECONDS)) {
         LOG.warn(
-            "Commit operation did not complete within 120 minutes of the all files "
+            "Commit operation did not complete within {} minutes ({} ms) of the all files "
                 + "being rewritten. This may mean that some changes were not successfully committed to the "
-                + "table.");
+                + "table.",
+            TimeUnit.MILLISECONDS.toMinutes(timeoutInMS),
+            timeoutInMS);
         timeout = true;
       }
     } catch (InterruptedException e) {

diff --git a/core/src/test/java/org/apache/iceberg/actions/TestCommitService.java b/core/src/test/java/org/apache/iceberg/actions/TestCommitService.java
@@ -29,6 +29,7 @@
 import java.util.stream.IntStream;
 import org.apache.iceberg.Table;
 import org.apache.iceberg.TableTestBase;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
 import org.apache.iceberg.relocated.com.google.common.collect.Sets;
 import org.apache.iceberg.util.Tasks;
 import org.assertj.core.api.Assertions;
@@ -83,6 +84,7 @@ public void testAbortFileGroupsAfterTimeout() {
         .untilAsserted(() -> assertThat(commitService.completedRewritesAllCommitted()).isTrue());
     Assertions.assertThat(commitService.results())
         .doesNotContainAnyElementsOf(commitService.aborted);
+    Assertions.assertThat(commitService.results()).isEqualTo(ImmutableList.of(0, 1, 2, 3, 4));
   }
 
   private static class CustomCommitService extends BaseCommitService<Integer> {