Skip to content

[#2674] improvement(client): use ack val to check the block send result #2703

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
xianjingfeng merged 6 commits into from
Dec 29, 2025
Merged

[#2674] improvement(client): use ack val to check the block send result #2703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
62db507
use ack val to check the block send result
xianjingfeng Dec 24, 2025
d3e17ed
nit
xianjingfeng Dec 24, 2025
c629196
fix bug
xianjingfeng Dec 24, 2025
ab80fbd
Make Spark2 and Spark3 consistent
xianjingfeng Dec 24, 2025
334d3b0
nit
xianjingfeng Dec 24, 2025
1ce1e26
nit
xianjingfeng Dec 24, 2025
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
91 changes: 66 additions & 25 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 @@ -24,10 +24,12 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.function.Supplier;
Expand Down Expand Up @@ -98,6 +100,7 @@ public class RssShuffleWriter<K, V, C> extends ShuffleWriter<K, V> {
private long taskAttemptId;
private ShuffleDependency<K, V, C> shuffleDependency;
private ShuffleWriteMetrics shuffleWriteMetrics;
private final BlockingQueue<Object> finishEventQueue = new LinkedBlockingQueue<>();
private Partitioner partitioner;
private boolean shouldPartition;
private WriteBufferManager bufferManager;
Expand Down Expand Up @@ -282,7 +285,7 @@ private void writeImpl(Iterator<Product2<K, V>> records) {
long s = System.currentTimeMillis();
checkAllBufferSpilled();
checkSentRecordCount(recordCount);
checkBlockSendResult(new HashSet<>(blockIds));
checkBlockSendResult(blockIds);
checkSentBlockCount();
final long checkDuration = System.currentTimeMillis() - s;
long commitDuration = 0;
Expand Down Expand Up @@ -396,6 +399,13 @@ protected List<CompletableFuture<Long>> postBlockEvent(
List<CompletableFuture<Long>> futures = new ArrayList<>();
for (AddBlockEvent event : bufferManager.buildBlockEvents(shuffleBlockInfoList)) {
futures.add(shuffleManager.sendData(event));
event.addCallback(
() -> {
boolean ret = finishEventQueue.add(new Object());
if (!ret) {
LOG.error("Add event " + event + " to finishEventQueue fail");
}
});
}
return futures;
}
Expand Down Expand Up @@ -435,42 +445,73 @@ protected void sendCommit() {

@VisibleForTesting
protected void checkBlockSendResult(Set<Long> blockIds) {
long start = System.currentTimeMillis();
while (true) {
Set<Long> failedBlockIds = shuffleManager.getFailedBlockIds(taskId);
Set<Long> successBlockIds = shuffleManager.getSuccessBlockIds(taskId);
// if failed when send data to shuffle server, mark task as failed
if (failedBlockIds.size() > 0) {
String errorMsg =
"Send failed: Task["
+ taskId
+ "] failed because "
+ failedBlockIds.size()
+ " blocks can't be sent to shuffle server: "
+ shuffleManager.getBlockIdsFailedSendTracker(taskId).getFaultyShuffleServers();
LOG.error(errorMsg);
throw new RssSendFailedException(errorMsg);
}
boolean interrupted = false;

// remove blockIds which was sent successfully, if there has none left, all data are sent
blockIds.removeAll(successBlockIds);
if (blockIds.isEmpty()) {
break;
try {
long remainingMs = sendCheckTimeout;
long end = System.currentTimeMillis() + remainingMs;
long currentAckValue = 0;
for (Long blockId : blockIds) {
currentAckValue ^= blockId;
}
while (true) {
try {
finishEventQueue.clear();
checkDataIfAnyFailure();
Set<Long> successBlockIds = shuffleManager.getSuccessBlockIds(taskId);
if (blockIds.size() == successBlockIds.size()) {
for (Long successBlockId : successBlockIds) {
currentAckValue ^= successBlockId;
}
if (currentAckValue != 0) {
String errorMsg = "Ack value is not equal to 0, it should not happen!";
throw new RssSendFailedException(errorMsg);
}
break;
}
if (finishEventQueue.isEmpty()) {
remainingMs = Math.max(end - System.currentTimeMillis(), 0);
Object event = finishEventQueue.poll(remainingMs, TimeUnit.MILLISECONDS);
if (event == null) {
break;
}
}
} catch (InterruptedException e) {
interrupted = true;
}
}
LOG.info("Wait " + blockIds.size() + " blocks sent to shuffle server");
Uninterruptibles.sleepUninterruptibly(sendCheckInterval, TimeUnit.MILLISECONDS);
if (System.currentTimeMillis() - start > sendCheckTimeout) {
Set<Long> successBlockIds = shuffleManager.getSuccessBlockIds(taskId);
if (currentAckValue != 0 || blockIds.size() != successBlockIds.size()) {
int failedBlockCount = blockIds.size() - successBlockIds.size();
String errorMsg =
"Timeout: Task["
+ taskId
+ "] failed because "
+ blockIds.size()
+ failedBlockCount
+ " blocks can't be sent to shuffle server in "
+ sendCheckTimeout
+ " ms.";
LOG.error(errorMsg);
throw new RssWaitFailedException(errorMsg);
}
} finally {
if (interrupted) {
Thread.currentThread().interrupt();
}
}
}

protected void checkDataIfAnyFailure() {
Set<Long> failedBlockIds = shuffleManager.getFailedBlockIds(taskId);
if (failedBlockIds.size() > 0) {
String errorMsg =
"Send failed: Task["
+ taskId
+ "] failed because "
+ failedBlockIds.size()
+ " blocks can't be sent to shuffle server: "
+ shuffleManager.getBlockIdsFailedSendTracker(taskId).getFaultyShuffleServers();
throw new RssSendFailedException(errorMsg);
}
}

Expand Down
23 changes: 17 additions & 6 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 @@ -389,7 +389,7 @@ protected void writeImpl(Iterator<Product2<K, V>> records) {
long checkStartTs = System.currentTimeMillis();
checkAllBufferSpilled();
checkSentRecordCount(recordCount);
checkBlockSendResult(new HashSet<>(blockIds));
checkBlockSendResult(blockIds);
checkSentBlockCount();
bufferManager.getShuffleServerPushCostTracker().statistics();
long commitStartTs = System.currentTimeMillis();
Expand Down Expand Up @@ -524,14 +524,23 @@ protected void checkBlockSendResult(Set<Long> blockIds) {
try {
long remainingMs = sendCheckTimeout;
long end = System.currentTimeMillis() + remainingMs;

long currentAckValue = 0;
for (Long blockId : blockIds) {
currentAckValue ^= blockId;
Copy link
Member

@zuston zuston Dec 25, 2025

Choose a reason for hiding this comment

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

lightweight and effective!

}
while (true) {
try {
finishEventQueue.clear();
checkDataIfAnyFailure();
Set<Long> successBlockIds = shuffleManager.getSuccessBlockIds(taskId);
blockIds.removeAll(successBlockIds);
if (blockIds.isEmpty()) {
if (blockIds.size() == successBlockIds.size()) {
for (Long successBlockId : successBlockIds) {
currentAckValue ^= successBlockId;
}
if (currentAckValue != 0) {
String errorMsg = "Ack value is not equal to 0, it should not happen!";
throw new RssSendFailedException(errorMsg);
}
break;
}
if (finishEventQueue.isEmpty()) {
Expand All @@ -545,12 +554,14 @@ protected void checkBlockSendResult(Set<Long> blockIds) {
interrupted = true;
}
}
if (!blockIds.isEmpty()) {
Set<Long> successBlockIds = shuffleManager.getSuccessBlockIds(taskId);
if (currentAckValue != 0 || blockIds.size() != successBlockIds.size()) {
int failedBlockCount = blockIds.size() - successBlockIds.size();
String errorMsg =
"Timeout: Task["
+ taskId
+ "] failed because "
+ blockIds.size()
+ failedBlockCount
+ " blocks can't be sent to shuffle server in "
+ sendCheckTimeout
+ " ms.";
Expand Down
Loading