Skip to content

[SPARK-28160][CORE] Fix a bug that callback function may hang when unchecked exception missed #24964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LantaoJin wants to merge 3 commits into from
Closed

[SPARK-28160][CORE] Fix a bug that callback function may hang when unchecked exception missed #24964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b3173c
[SPARK-28160][Core] Fix a bug that TransportClient.sendRpcSync may ha…
LantaoJin Jun 25, 2019
794602a
bug in ExternalShuffleClient
LantaoJin Jun 26, 2019
d2330cc
address comment
LantaoJin Jun 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions common/network-common/src/main/java/org/apache/spark/network/client/TransportClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,16 @@ public ByteBuffer sendRpcSync(ByteBuffer message, long timeoutMs) {
sendRpc(message, new RpcResponseCallback() {
@Override
public void onSuccess(ByteBuffer response) {
ByteBuffer copy = ByteBuffer.allocate(response.remaining());
copy.put(response);
// flip "copy" to make it readable
copy.flip();
result.set(copy);
try {
ByteBuffer copy = ByteBuffer.allocate(response.remaining());
copy.put(response);
// flip "copy" to make it readable
copy.flip();
result.set(copy);
} catch (Throwable t) {
Copy link
Member

@srowen srowen Jun 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to log the throwable here just for completeness?

Copy link
Contributor Author

@LantaoJin LantaoJin Jun 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will add a warning log.

logger.warn("Error in responding PRC callback", t);
result.setException(t);
}
}

@Override
Expand Down
13 changes: 10 additions & 3 deletions ...network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,16 @@ public Future<Integer> removeBlocks(
client.sendRpc(removeBlocksMessage, new RpcResponseCallback() {
@Override
public void onSuccess(ByteBuffer response) {
BlockTransferMessage msgObj = BlockTransferMessage.Decoder.fromByteBuffer(response);
numRemovedBlocksFuture.complete(((BlocksRemoved)msgObj).numRemovedBlocks);
client.close();
try {
BlockTransferMessage msgObj = BlockTransferMessage.Decoder.fromByteBuffer(response);
numRemovedBlocksFuture.complete(((BlocksRemoved) msgObj).numRemovedBlocks);
} catch (Throwable t) {
logger.warn("Error trying to remove RDD blocks " + Arrays.toString(blockIds) +
" via external shuffle service from executor: " + execId, t);
numRemovedBlocksFuture.complete(0);
} finally {
client.close();
}
}

@Override
Expand Down