You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by ni...@apache.org on 2024/02/18 09:19:14 UTC
(incubator-celeborn) branch branch-0.4 updated: [CELEBORN-448][FOLLOWUP] HeartbeatFromApplicationResponse should include manually excluded workers
This is an automated email from the ASF dual-hosted git repository.
nicholasjiang pushed a commit to branch branch-0.4
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/branch-0.4 by this push:
new acfb7e501 [CELEBORN-448][FOLLOWUP] HeartbeatFromApplicationResponse should include manually excluded workers
acfb7e501 is described below
commit acfb7e501147d2a78732c5cbde5f27b672939642
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>
(cherry picked from commit 67d8236a55ae69264e1c7972f1db409382af61ca)
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 cca9047d2..799250dd1 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
@@ -864,7 +864,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 {