(incubator-celeborn) branch main updated: [CELEBORN-448][FOLLOWUP] HeartbeatFromApplicationResponse should include manually excluded workers

[ni...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 67d8236a5 [CELEBORN-448][FOLLOWUP] HeartbeatFromApplicationResponse should include manually excluded workers
67d8236a5 is described below

commit 67d8236a55ae69264e1c7972f1db409382af61ca
Author: SteNicholas <pr...@163.com>
AuthorDate: Sun Feb 18 17:18:45 2024 +0800

    [CELEBORN-448][FOLLOWUP] HeartbeatFromApplicationResponse should include manually excluded workers
    
    ### What changes were proposed in this pull request?
    
    Fix `HeartbeatFromApplicationResponse` does not include manually excluded workers.
    
    ### Why are the changes needed?
    
    `HeartbeatFromApplicationResponse` should include manually excluded workers, otherwise `WorkerStatusTracker` misses the manually excluded workers.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Local test and GA.
    
    Closes #2297 from SteNicholas/CELEBORN-448.
    
    Authored-by: SteNicholas <pr...@163.com>
    Signed-off-by: SteNicholas <pr...@163.com>
---
 .../main/scala/org/apache/celeborn/service/deploy/master/Master.scala  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala b/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala
index b4bcfc49b..20fb777ec 100644
--- a/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala
+++ b/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala
@@ -978,7 +978,8 @@ private[celeborn] class Master(
     if (shouldResponse) {
       context.reply(HeartbeatFromApplicationResponse(
         StatusCode.SUCCESS,
-        new util.ArrayList(statusSystem.excludedWorkers),
+        new util.ArrayList(
+          (statusSystem.excludedWorkers.asScala ++ statusSystem.manuallyExcludedWorkers.asScala).asJava),
         needCheckedWorkerList,
         shutdownWorkerSnapshot))
     } else {