Skip to content

fix(spark): Increment segmentIndex when skipping segment due to crc check failure #2746

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 2 commits into from
Apr 7, 2026
+32 −5
Merged

fix(spark): Increment segmentIndex when skipping segment due to crc check failure #2746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d02c244
fix(spark): Increment segmentIndex when skipping segment due to crc c…
wForget Mar 30, 2026
e24b5c6
spotless
wForget Mar 30, 2026
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
5 changes: 5 additions & 0 deletions client/src/main/java/org/apache/uniffle/client/impl/ShuffleReadClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ public ShuffleBlock readShuffleBlockData() {
if (shuffleServerInfoList.size() > 1) {
LOG.warn(errMsg);
clientReadHandler.updateConsumedBlockInfo(bs, true);
if (decompressionWorker != null) {
Copy link
Copy Markdown
Member

@zuston zuston Mar 31, 2026

Choose a reason for hiding this comment

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

Nice catch!

decompressionWorker.get(batchIndex - 1, segmentIndex++);
} else {
segmentIndex += 1;
}
continue;
} else {
throw new RssFetchFailedException(errMsg);
Expand Down
32 changes: 27 additions & 5 deletions client/src/test/java/org/apache/uniffle/client/impl/ShuffleReadClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.uniffle.client.impl;

import java.nio.ByteBuffer;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
Expand All @@ -38,7 +39,6 @@

import org.apache.uniffle.client.TestUtils;
import org.apache.uniffle.client.factory.ShuffleClientFactory;
import org.apache.uniffle.client.response.ShuffleBlock;
import org.apache.uniffle.common.ClientType;
import org.apache.uniffle.common.ShufflePartitionedBlock;
import org.apache.uniffle.common.ShuffleServerInfo;
Expand All @@ -59,6 +59,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;

public class ShuffleReadClientImplTest extends HadoopTestBase {

Expand Down Expand Up @@ -371,11 +372,14 @@ public void readTest8(Supplier<ShuffleClientFactory.ReadClientBuilder> builderSu
String basePath = uniq(HDFS_URI + "clientReadTest8");
HadoopShuffleWriteHandler writeHandler =
new HadoopShuffleWriteHandler("appId", 0, 0, 1, basePath, ssi1.getId(), conf);
HadoopShuffleWriteHandler writeHandler2 =
new HadoopShuffleWriteHandler("appId", 0, 0, 1, basePath, ssi2.getId(), conf);

Map<Long, byte[]> expectedData = Maps.newHashMap();
LinkedHashMap<Long, byte[]> expectedData = Maps.newLinkedHashMap();
Roaring64NavigableMap blockIdBitmap = Roaring64NavigableMap.bitmapOf();
Roaring64NavigableMap taskIdBitmap = Roaring64NavigableMap.bitmapOf(0);
writeTestData(writeHandler, 2, 30, 0, 0, expectedData, blockIdBitmap);
writeTestData(writeHandler2, 2, 30, 0, 0, expectedData, blockIdBitmap);
ShuffleReadClientImpl readClient =
builderSupplier
.get()
Expand All @@ -396,8 +400,19 @@ public void readTest8(Supplier<ShuffleClientFactory.ReadClientBuilder> builderSu
.shuffleServerInfoList(Lists.newArrayList(ssi1, ssi2))
.build();
// crc32 is incorrect
AtomicInteger readCount = new AtomicInteger(0);
try (MockedStatic<ChecksumUtils> checksumUtilsMock = Mockito.mockStatic(ChecksumUtils.class)) {
checksumUtilsMock.when(() -> ChecksumUtils.getCrc32((ByteBuffer) any())).thenReturn(-1L);
checksumUtilsMock
.when(() -> ChecksumUtils.getCrc32(any(ByteBuffer.class), anyInt(), anyInt()))
.then(
invocation -> {
// crc check fails for readClient1 and frist block of readClient2
if (readCount.getAndIncrement() < 2) {
return -1;
} else {
return invocation.callRealMethod();
}
});
try {
ByteBuffer bb = readClient.readShuffleBlockData().getByteBuffer();
while (bb != null) {
Expand All @@ -408,8 +423,15 @@ public void readTest8(Supplier<ShuffleClientFactory.ReadClientBuilder> builderSu
assertTrue(e.getMessage().startsWith("Unexpected crc value"), e.getMessage());
}

ShuffleBlock block = readClient2.readShuffleBlockData();
assertNull(block);
// the frist block has been skipped due to crc check failure
Long firstKey = expectedData.keySet().iterator().next();
expectedData.remove(firstKey);
TestUtils.validateResult(readClient2, expectedData);
try {
readClient2.checkProcessedBlockIds();
} catch (Exception e) {
assertTrue(e.getMessage().contains("expected 4 blocks, actual 3 blocks"), e.getMessage());
}
}
readClient.close();
readClient2.close();
Expand Down
Loading