This is an automated email from the ASF dual-hosted git repository.
SteNicholas pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new b1a7cb496 [CELEBORN-2315][FOLLOWUP] Change assertIteratorFullyConsumed
to throw CelebornIOException
b1a7cb496 is described below
commit b1a7cb4964f55a05544334befb0e49f78001f872
Author: James Xu <[email protected]>
AuthorDate: Thu Jun 11 16:15:31 2026 +0800
[CELEBORN-2315][FOLLOWUP] Change assertIteratorFullyConsumed to throw
CelebornIOException
### What changes were proposed in this pull request?
Replace TaskKilledException with CelebornIOException in
assertIteratorFullyConsumed. CelebornIOException extends IOException and fits
the existing throws IOException contract of all write() methods cleanly,
without needing an unchecked exception workaround.
Also revert the throwTaskKillException(String message) overload added to
TaskInterruptedHelper in CELEBORN-2315, which is now dead code.
### Why are the changes needed?
### Does this PR resolve a correctness bug?
- [ ] Yes
### Does this PR introduce _any_ user-facing change?
- [ ] Yes
### How was this patch tested?
Closes #3728 from xumingming/celeborn-2315-followup-celebornioexception.
Authored-by: James Xu <[email protected]>
Signed-off-by: Nicholas Jiang <[email protected]>
---
.../apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java | 2 +-
.../src/main/java/org/apache/spark/shuffle/celeborn/SparkUtils.java | 1 +
.../apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/client-spark/spark-2/src/test/java/org/apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java
b/client-spark/spark-2/src/test/java/org/apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java
index ab0026023..340237ee7 100644
---
a/client-spark/spark-2/src/test/java/org/apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java
+++
b/client-spark/spark-2/src/test/java/org/apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java
@@ -217,7 +217,7 @@ public abstract class CelebornShuffleWriterSuiteBase {
}
@Test
- public void testAssertIteratorFullyConsumed() {
+ public void testAssertIteratorFullyConsumed() throws IOException {
SparkUtils.assertIteratorFullyConsumed(false);
}
diff --git
a/client-spark/spark-3/src/main/java/org/apache/spark/shuffle/celeborn/SparkUtils.java
b/client-spark/spark-3/src/main/java/org/apache/spark/shuffle/celeborn/SparkUtils.java
index 696a39087..613ac7f99 100644
---
a/client-spark/spark-3/src/main/java/org/apache/spark/shuffle/celeborn/SparkUtils.java
+++
b/client-spark/spark-3/src/main/java/org/apache/spark/shuffle/celeborn/SparkUtils.java
@@ -18,6 +18,7 @@
package org.apache.spark.shuffle.celeborn;
import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.HashSet;
diff --git
a/client-spark/spark-3/src/test/java/org/apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java
b/client-spark/spark-3/src/test/java/org/apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java
index dbc0e8e89..b5bacf489 100644
---
a/client-spark/spark-3/src/test/java/org/apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java
+++
b/client-spark/spark-3/src/test/java/org/apache/spark/shuffle/celeborn/CelebornShuffleWriterSuiteBase.java
@@ -311,7 +311,7 @@ public abstract class CelebornShuffleWriterSuiteBase {
}
@Test
- public void testAssertIteratorFullyConsumed() {
+ public void testAssertIteratorFullyConsumed() throws IOException {
// Test that assertIteratorFullyConsumed does not throw when iterator is
empty
SparkUtils.assertIteratorFullyConsumed(false);
}
