[incubator-celeborn] branch branch-0.3 updated: [CELEBORN-656][FOLLOWUP] Fix wrong message call when revive return STAGE_END

[zhouky]

This is an automated email from the ASF dual-hosted git repository.

zhouky pushed a commit to branch branch-0.3
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git


The following commit(s) were added to refs/heads/branch-0.3 by this push:
     new 884851363 [CELEBORN-656][FOLLOWUP] Fix wrong message call when revive 
return STAGE_END
884851363 is described below

commit 8848513636520d5b71a889fbfd8a8f217504da06
Author: Angerszhuuuu <angers....@gmail.com>
AuthorDate: Mon Jul 24 20:20:22 2023 +0800

    [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 <angers....@gmail.com>
    Signed-off-by: zky.zhoukeyong <zky.zhoukey...@alibaba-inc.com>
    (cherry picked from commit 67c18e6607efececd2757c80689c9451528a4812)
    Signed-off-by: zky.zhoukeyong <zky.zhoukey...@alibaba-inc.com>
---
 .../src/main/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 7544f11b6..9db354897 100644
--- a/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java
+++ b/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java
@@ -728,7 +728,7 @@ public class ShuffleClientImpl extends ShuffleClient {
             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!");
@@ -1639,10 +1639,10 @@ public class ShuffleClientImpl extends ShuffleClient {
 
   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);
   }