Skip to content

[SPARK-34534][CORE] Fix blockIds order when use FetchShuffleBlocks to fetch blocks #31643

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
seayoun wants to merge 13 commits into from
Closed

[SPARK-34534][CORE] Fix blockIds order when use FetchShuffleBlocks to fetch blocks #31643

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0af3b01
fix blockIds order when use FetchShuffleBlocks to fetch blocks
Feb 25, 2021
384f43c
fix unOrder mapIds, and check mapIds order and reduce order when pars…
Feb 26, 2021
0006553
change code
Feb 26, 2021
006a5ec
add comment
Feb 26, 2021
a08ca1d
add test case
Feb 26, 2021
1234253
fix some wrong words and update test case
Feb 26, 2021
7987a25
change for line length
Feb 27, 2021
e823930
change indentations
Mar 1, 2021
0748d20
revert inital fix and regenerate blockIds
Mar 2, 2021
42b9621
add `mapIdToBlockIds` to fill blockIds
Mar 2, 2021
575ca5e
replace a single map instead of two in createFetchShuffleBlocksMsgAnd…
Mar 2, 2021
6377217
change mapIdToBlocksInfo to a LinkedHashMap
Mar 2, 2021
9cf23df
remove public
Mar 3, 2021
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
Prev Previous commit
Next Next commit
add test case
  • Loading branch information
yuhaiyang authored and yuhaiyang committed Feb 26, 2021
commit a08ca1da29103ce8b16bc81fc208992f4561fb1f
44 changes: 44 additions & 0 deletions ...rk-shuffle/src/test/java/org/apache/spark/network/shuffle/OneForOneBlockFetcherSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,50 @@ public void testEmptyBlockFetch() {
}
}

@Test
public void testFetchShuffleBlocksOrder() {
LinkedHashMap<String, ManagedBuffer> blocks = Maps.newLinkedHashMap();
blocks.put("shuffle_0_0_0", new NioManagedBuffer(ByteBuffer.wrap(new byte[1])));
blocks.put("shuffle_0_2_1", new NioManagedBuffer(ByteBuffer.wrap(new byte[2])));
blocks.put("shuffle_0_10_2", new NettyManagedBuffer(Unpooled.wrappedBuffer(new byte[3])));
String[] blockIds = blocks.keySet().toArray(new String[blocks.size()]);

BlockFetchingListener listener = fetchBlocks(
blocks,
blockIds,
new FetchShuffleBlocks("app-id", "exec-id", 0, new long[]{0}, new int[][]{{0, 3}}, false),
conf);

for (int chunkIndex = 0; chunkIndex < blockIds.length; chunkIndex++) {
String blockId = blockIds[chunkIndex];
verify(listener).onBlockFetchSuccess(blockId, blocks.get(blockId));
}
}

@Test
public void testBatchFetchShuffleBlocksOrder() {
LinkedHashMap<String, ManagedBuffer> blocks = Maps.newLinkedHashMap();
blocks.put("shuffle_0_0_1_2", new NioManagedBuffer(ByteBuffer.wrap(new byte[1])));
blocks.put("shuffle_0_2_2_3", new NioManagedBuffer(ByteBuffer.wrap(new byte[2])));
blocks.put("shuffle_0_10_3_4", new NettyManagedBuffer(Unpooled.wrappedBuffer(new byte[3])));
String[] blockIds = blocks.keySet().toArray(new String[blocks.size()]);

BlockFetchingListener listener = fetchBlocks(
blocks,
blockIds,
new OpenBlocks("app-id", "exec-id", blockIds),
new TransportConf("shuffle", new MapConfigProvider(
new HashMap<String, String>() {{
put("spark.shuffle.useOldFetchProtocol", "true");
}}
)));

for (int chunkIndex = 0; chunkIndex < blockIds.length; chunkIndex++) {
String blockId = blockIds[chunkIndex];
verify(listener).onBlockFetchSuccess(blockId, blocks.get(blockId));
}
}

/**
* Begins a fetch on the given set of blocks by mocking out the server side of the RPC which
* simply returns the given (BlockId, Block) pairs.
Expand Down