Z1Wu opened a new pull request, #2926:
URL: https://github.com/apache/celeborn/pull/2926
<!--
Thanks for sending a pull request! Here are some tips for you:
- Make sure the PR title start w/ a JIRA ticket, e.g. '[CELEBORN-XXXX]
Your PR title ...'.
- Be sure to keep the PR description updated to reflect all changes.
- Please write your PR title to summarize what this PR proposes.
- If possible, provide a concise example to reproduce the issue for a
faster review.
-->
### What changes were proposed in this pull request?
when code execute in this path , an unexpected NPE occurs .
1. write data
``` java
// org.apache.spark.shuffle.celeborn.HashBasedShuffleWriter#write
public void write(scala.collection.Iterator<Product2<K, V>> records) throws
IOException {
boolean needCleanupPusher = true;
try {
....
// write data
close();
needCleanupPusher = false;
} catch (InterruptedException e) {
TaskInterruptedHelper.throwTaskKillException();
} finally {
if (needCleanupPusher) {
cleanupPusher();
}
}
}
```
2. close data pusher, exception may throw when push merge data after set
`IdleQueue` to null.
```java
org.apache.spark.shuffle.celeborn.HashBasedShuffleWriter#close
private void close() throws IOException, InterruptedException {
long pushMergedDataTime = System.nanoTime();
dataPusher.waitOnTermination();
// ** set `IdleQueue` to null here
sendBufferPool.returnPushTaskQueue(dataPusher.getAndResetIdleQueue());
shuffleClient.prepareForMergeData(shuffleId, mapId, encodedAttemptId);
closeWrite();
// ** exception occurs when push merge data
shuffleClient.pushMergedData(shuffleId, mapId, encodedAttemptId);
.....
}
```
3. cleanup DataPusher in `finally`
``` java
//
org.apache.spark.shuffle.celeborn.HashBasedShuffleWriter#write{finally_block}
// ->org.apache.spark.shuffle.celeborn.HashBasedShuffleWriter#cleanupPusher
// -> org.apache.celeborn.client.write.DataPusher#waitOnTermination
// ->
org.apache.celeborn.client.write.DataPusher#waitIdleQueueFullWithLock
private void waitIdleQueueFullWithLock() throws InterruptedException {
try {
while (idleQueue.remainingCapacity() > 0 // ** where npe occurs **
&& exceptionRef.get() == null
&& (pushThread != null && pushThread.isAlive())) {
idleFull.await(WAIT_TIME_NANOS, TimeUnit.NANOSECONDS);
}
} catch (InterruptedException e) {
logger.error("Thread interrupted while waitIdleQueueFullWithLock.", e);
throw e;
} finally {
idleLock.unlock();
}
}
```
error stacktrace
### Why are the changes needed?
avoid potential NPE exception when clean up data pusher.
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
