mridulm commented on a change in pull request #35325:
URL: https://github.com/apache/spark/pull/35325#discussion_r792754171
##########
File path:
common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RemoteBlockPushResolver.java
##########
@@ -1008,19 +995,28 @@ AppShufflePartitionInfo getPartitionInfo() {
* required for the shuffles of indeterminate stages.
*/
public static class AppShuffleMergePartitionsInfo {
+ // ConcurrentHashMap doesn't allow null for keys or values which is why
this is required.
+ // Marker to identify finalized indeterminate shuffle partitions in the
case of indeterminate
+ // stage retries.
+ @VisibleForTesting
+ public static final Map<Integer, AppShufflePartitionInfo>
SHUFFLE_FINALIZED_MARKER =
+ Collections.emptyMap();
private final int shuffleMergeId;
- private final Map<Integer, AppShufflePartitionInfo> shuffleMergePartitions;
+ private final Map<Integer, AppShufflePartitionInfo> mergePartitions;
Review comment:
nit: avoid rename here ?
##########
File path:
common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/RemoteBlockPushResolverSuite.java
##########
@@ -1287,6 +1287,52 @@ void closeAndDeletePartitionFiles(Map<Integer,
AppShufflePartitionInfo> partitio
+ " up", appShuffleInfo.getMergedShuffleDataFile(0, 4, 0).exists());
}
+ // Test for SPARK-37675 and SPARK-37793
+ @Test
+ public void testAllBlocksAreRejectedWhenReceivedAfterFinalization() throws
IOException {
Review comment:
Also add a test for the cardinality change ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
