(hive) branch master updated: HIVE-29689: TestHiveSplitGenerator.testExceptionIsPropagatedFromSplitSerializer is flaky (#6570)

[abstractdog]

This is an automated email from the ASF dual-hosted git repository.

abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new fc877ff2130 HIVE-29689: 
TestHiveSplitGenerator.testExceptionIsPropagatedFromSplitSerializer is flaky 
(#6570)
fc877ff2130 is described below

commit fc877ff2130cad5d8db364ffa129e3e717674449
Author: Bodor Laszlo <bodorlaszlo0...@gmail.com>
AuthorDate: Tue Jun 30 11:36:16 2026 +0200

    HIVE-29689: 
TestHiveSplitGenerator.testExceptionIsPropagatedFromSplitSerializer is flaky 
(#6570)
---
 .../hadoop/hive/ql/exec/tez/TestHiveSplitGenerator.java | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git 
a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestHiveSplitGenerator.java 
b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestHiveSplitGenerator.java
index 8780cb67cd4..28c3ba87dff 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestHiveSplitGenerator.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestHiveSplitGenerator.java
@@ -20,6 +20,8 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.hadoop.conf.Configuration;
@@ -203,6 +205,9 @@ public static class HiveSplitGeneratorSerializerException 
extends HiveSplitGener
     private static final String EXCEPTION_MESSAGE = "Cannot write file to 
path";
     private final AtomicBoolean split0Finished = new AtomicBoolean(false);
     private final AtomicBoolean split2Finished = new AtomicBoolean(false);
+    // Ensures split #0's writeSplit() is past the anyTaskFailed check before 
split #1 throws,
+    // so the test deterministically exercises the "already running future is 
not cancelled" path.
+    private final CountDownLatch split0Started = new CountDownLatch(1);
 
     class SplitSerializerWithException extends SplitSerializer {
       SplitSerializerWithException() throws IOException {
@@ -229,6 +234,7 @@ void writeSplit(int count, MRSplitProto mrSplit, Path 
filePath) throws IOExcepti
         // current implementation of the waitFor doesn't cancel it
         LOG.info("Write split #{}", count);
         if (count == 0) {
+          split0Started.countDown();
           try {
             Thread.sleep(1000);
             split0Finished.set(true);
@@ -238,8 +244,17 @@ void writeSplit(int count, MRSplitProto mrSplit, Path 
filePath) throws IOExcepti
             throw new IOException(e);
           }
         }
-        // writing second split fails
+        // writing second split fails - but wait until split #0 is already 
running so the
+        // anyTaskFailed flag cannot short-circuit it before it gets a chance 
to call writeSplit().
         if (count == 1) {
+          try {
+            if (!split0Started.await(10, TimeUnit.SECONDS)) {
+              throw new IOException("Timed out waiting for split #0 to start");
+            }
+          } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IOException(e);
+          }
           LOG.info("Split #1 is about to throw exception");
           throw new IOException(EXCEPTION_MESSAGE + ": " + filePath);
         }