Skip to content

[#825][followup] fix(spark):Fix without returning an exception. #1402

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

Merged
zuston merged 1 commit into from
Dec 28, 2023
Merged

[#825][followup] fix(spark):Fix without returning an exception. #1402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions client-spark/spark2/src/main/java/org/apache/spark/shuffle/writer/RssShuffleWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public void write(Iterator<Product2<K, V>> records) {
} catch (Exception e) {
taskFailureCallback.apply(taskId);
if (shuffleManager.isRssResubmitStage()) {
throw throwFetchFailedIfNecessary(e);
throwFetchFailedIfNecessary(e);
} else {
throw e;
}
Expand Down Expand Up @@ -466,7 +466,7 @@ private static ShuffleManagerClient createShuffleManagerClient(String host, int
return ShuffleManagerClientFactory.getInstance().createShuffleManagerClient(grpc, host, port);
}

private RssException throwFetchFailedIfNecessary(Exception e) {
private void throwFetchFailedIfNecessary(Exception e) {
// The shuffleServer is registered only when a Block fails to be sent
if (e instanceof RssSendFailedException) {
Map<Long, BlockingQueue<ShuffleServerInfo>> failedBlockIds =
Expand Down Expand Up @@ -506,12 +506,12 @@ private RssException throwFetchFailedIfNecessary(Exception e) {
FetchFailedException ffe =
RssSparkShuffleUtils.createFetchFailedException(
shuffleId, -1, taskContext.stageAttemptNumber(), e);
return new RssException(ffe);
throw new RssException(ffe);
}
} catch (IOException ioe) {
LOG.info("Error closing shuffle manager client with error:", ioe);
}
}
return new RssException(e);
throw new RssException(e);
}
}
10 changes: 5 additions & 5 deletions client-spark/spark3/src/main/java/org/apache/spark/shuffle/writer/RssShuffleWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,13 @@ private boolean isMemoryShuffleEnabled(String storageType) {
}

@Override
public void write(Iterator<Product2<K, V>> records) throws IOException {
public void write(Iterator<Product2<K, V>> records) {
try {
writeImpl(records);
} catch (Exception e) {
taskFailureCallback.apply(taskId);
if (shuffleManager.isRssResubmitStage()) {
throw throwFetchFailedIfNecessary(e);
throwFetchFailedIfNecessary(e);
} else {
throw e;
}
Expand Down Expand Up @@ -501,7 +501,7 @@ private static ShuffleManagerClient createShuffleManagerClient(String host, int
return ShuffleManagerClientFactory.getInstance().createShuffleManagerClient(grpc, host, port);
}

private RssException throwFetchFailedIfNecessary(Exception e) {
private void throwFetchFailedIfNecessary(Exception e) {
// The shuffleServer is registered only when a Block fails to be sent
if (e instanceof RssSendFailedException) {
Map<Long, BlockingQueue<ShuffleServerInfo>> failedBlockIds =
Expand Down Expand Up @@ -541,12 +541,12 @@ private RssException throwFetchFailedIfNecessary(Exception e) {
FetchFailedException ffe =
RssSparkShuffleUtils.createFetchFailedException(
shuffleId, -1, taskContext.stageAttemptNumber(), e);
return new RssException(ffe);
throw new RssException(ffe);
}
} catch (IOException ioe) {
LOG.info("Error closing shuffle manager client with error:", ioe);
}
}
return new RssException(e);
throw new RssException(e);
}
}