This is an automated email from the ASF dual-hosted git repository.
rexxiong pushed a commit to branch branch-0.4
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/branch-0.4 by this push:
new 8dbe29df6 [CELEBORN-1384] Manually excluding workers should not depend
on whether the workers are alive
8dbe29df6 is described below
commit 8dbe29df6b24a606545140f25b0252a955fa6139
Author: SteNicholas <[email protected]>
AuthorDate: Thu Apr 18 18:09:55 2024 +0800
[CELEBORN-1384] Manually excluding workers should not depend on whether the
workers are alive
### What changes were proposed in this pull request?
Manually excluding workers should not depend on whether the workers are
alive or not for master.
### Why are the changes needed?
When the workers are offline, master could not add or remove workers
through manually excluding workers. Therefore, master should support manually
excluding workers no matter whether the workers are alive or not.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Manual test.
Closes #2465 from SteNicholas/CELEBORN-1384.
Authored-by: SteNicholas <[email protected]>
Signed-off-by: Shuang <[email protected]>
(cherry picked from commit 2c76a6e429d69d010482e149051dd0322e7d9853)
Signed-off-by: Shuang <[email protected]>
---
.../scala/org/apache/celeborn/service/deploy/master/Master.scala | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
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 ddcb245dd..d126edb4a 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
@@ -557,10 +557,7 @@ private[celeborn] class Master(
workersToAdd: util.List[WorkerInfo],
workersToRemove: util.List[WorkerInfo],
requestId: String): Unit = {
- statusSystem.handleWorkerExclude(
- workersToAdd.asScala.filter(workersSnapShot.contains(_)).asJava,
- workersToRemove.asScala.filter(workersSnapShot.contains(_)).asJava,
- requestId)
+ statusSystem.handleWorkerExclude(workersToAdd, workersToRemove, requestId)
if (context != null) {
context.reply(WorkerExcludeResponse(true))
}