You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by re...@apache.org on 2023/03/29 02:23:30 UTC
[incubator-celeborn] 15/42: [CELEBORN-406] Add blacklist to http request to indicate blacklisted worker (#1334)
This is an automated email from the ASF dual-hosted git repository.
rexxiong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
commit 9a41a0ce321661272c46b30cf0f5e1a52a0b746b
Author: Angerszhuuuu <an...@gmail.com>
AuthorDate: Mon Mar 13 16:44:46 2023 +0800
[CELEBORN-406] Add blacklist to http request to indicate blacklisted worker (#1334)
---
.../scala/org/apache/celeborn/service/deploy/master/Master.scala | 9 +++++++++
.../scala/org/apache/celeborn/server/common/HttpService.scala | 2 ++
.../apache/celeborn/server/common/http/HttpRequestHandler.scala | 2 ++
.../scala/org/apache/celeborn/service/deploy/worker/Worker.scala | 2 ++
4 files changed, 15 insertions(+)
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 b431d5220..5367d9482 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
@@ -728,6 +728,15 @@ private[celeborn] class Master(
sb.toString()
}
+ override def getBlacklistedWorkers: String = {
+ val sb = new StringBuilder
+ sb.append("==========Blacklisted WorkerInfos in Master==========\n")
+ statusSystem.blacklist.asScala.map { worker =>
+ sb.append(s"${worker.toUniqueId()}\n")
+ }
+ sb.toString()
+ }
+
override def getThreadDump: String = {
val sb = new StringBuilder
val threadDump = Utils.getThreadDump()
diff --git a/service/src/main/scala/org/apache/celeborn/server/common/HttpService.scala b/service/src/main/scala/org/apache/celeborn/server/common/HttpService.scala
index 25d3abd9f..b612460df 100644
--- a/service/src/main/scala/org/apache/celeborn/server/common/HttpService.scala
+++ b/service/src/main/scala/org/apache/celeborn/server/common/HttpService.scala
@@ -29,6 +29,8 @@ abstract class HttpService extends Service with Logging {
def getLostWorkers: String
+ def getBlacklistedWorkers: String
+
def getThreadDump: String
def getHostnameList: String
diff --git a/service/src/main/scala/org/apache/celeborn/server/common/http/HttpRequestHandler.scala b/service/src/main/scala/org/apache/celeborn/server/common/http/HttpRequestHandler.scala
index 54377476a..6e2fe0b0c 100644
--- a/service/src/main/scala/org/apache/celeborn/server/common/http/HttpRequestHandler.scala
+++ b/service/src/main/scala/org/apache/celeborn/server/common/http/HttpRequestHandler.scala
@@ -66,6 +66,8 @@ class HttpRequestHandler(
service.getWorkerInfo
case "/lostWorkers" if service.serviceName == Service.MASTER =>
service.getLostWorkers
+ case "/blacklistedWorkers" if service.serviceName == Service.MASTER =>
+ service.getBlacklistedWorkers
case "/threadDump" =>
service.getThreadDump
case "/hostnames" if service.serviceName == Service.MASTER =>
diff --git a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala
index 5a625d6ab..b13dc5faf 100644
--- a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala
+++ b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala
@@ -451,6 +451,8 @@ private[celeborn] class Worker(
override def getLostWorkers: String = throw new UnsupportedOperationException()
+ override def getBlacklistedWorkers: String = throw new UnsupportedOperationException()
+
override def getThreadDump: String = Utils.getThreadDump()
override def getHostnameList: String = throw new UnsupportedOperationException()