From 67c18e6607efececd2757c80689c9451528a4812 Mon Sep 17 00:00:00 2001 From: Angerszhuuuu Date: Mon, 24 Jul 2023 20:20:22 +0800 Subject: [PATCH] [CELEBORN-656][FOLLOWUP] Fix wrong message call when revive return STAGE_END ### What changes were proposed in this pull request? As title ### Why are the changes needed? ### Does this PR introduce _any_ user-facing change? ### How was this patch tested? Closes #1755 from AngersZhuuuu/CELEBORN-656-FOLLOWUP. Authored-by: Angerszhuuuu Signed-off-by: zky.zhoukeyong --- .../java/org/apache/celeborn/client/ShuffleClientImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java b/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java index 19e03c63fd6..202eb62d3ad 100644 --- a/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java +++ b/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java @@ -729,7 +729,7 @@ Map reviveBatch( pushExcludedWorkers.remove(loc.getPeer().hostAndPushPort()); } } else if (StatusCode.STAGE_ENDED.getValue() == statusCode) { - stageEnded(shuffleId); + stageEndShuffleSet.add(shuffleId); return results; } else if (StatusCode.SHUFFLE_NOT_REGISTERED.getValue() == statusCode) { logger.error("SHUFFLE_NOT_REGISTERED!"); @@ -1650,10 +1650,10 @@ public void setupLifecycleManagerRef(RpcEndpointRef endpointRef) { boolean mapperEnded(int shuffleId, int mapId) { return (mapperEndMap.containsKey(shuffleId) && mapperEndMap.get(shuffleId).contains(mapId)) - || stageEnded(shuffleId); + || isStageEnded(shuffleId); } - protected boolean stageEnded(int shuffleId) { + protected boolean isStageEnded(int shuffleId) { return stageEndShuffleSet.contains(shuffleId); }