You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by an...@apache.org on 2023/03/15 08:30:28 UTC
[incubator-celeborn] branch main updated: [CELEBORN-423][FOLLOWUP] Format http request (#1353)
This is an automated email from the ASF dual-hosted git repository.
angerszhuuuu 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 e61130d39 [CELEBORN-423][FOLLOWUP] Format http request (#1353)
e61130d39 is described below
commit e61130d3976f7e80517b57d9390b55a230fbeff2
Author: Angerszhuuuu <an...@gmail.com>
AuthorDate: Wed Mar 15 16:30:23 2023 +0800
[CELEBORN-423][FOLLOWUP] Format http request (#1353)
* [CELEBORN-423][FOLLOWUP] Format http request
---
.../org/apache/celeborn/service/deploy/master/Master.scala | 14 +++++++-------
.../org/apache/celeborn/server/common/HttpService.scala | 2 +-
.../org/apache/celeborn/service/deploy/worker/Worker.scala | 4 ++--
3 files changed, 10 insertions(+), 10 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 7bcbb419f..e2ed27404 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
@@ -700,7 +700,7 @@ private[celeborn] class Master(
val sb = new StringBuilder
sb.append("====================== Workers Info in Master ===========================")
workersSnapShot.asScala.foreach { w =>
- sb.append(s"${w.toUniqueId().padTo(50, " ")}in Master\n")
+ sb.append(s"${w.toUniqueId().padTo(50, " ").mkString}in Master\n")
sb.append(w).append("\n")
sb.append("\n")
@@ -708,16 +708,16 @@ private[celeborn] class Master(
.workerInfos.asJava
.get(0)
- sb.append(s"${w.toUniqueId().padTo(50, " ")}in Worker\n")
+ sb.append(s"${w.toUniqueId().padTo(50, " ").mkString}in Worker\n")
sb.append(workerInfo).append("\n")
sb.append("\n")
if (w.hasSameInfoWith(workerInfo)) {
- sb.append(s"${w.toUniqueId().padTo(50, " ")}status consist!\n")
+ sb.append(s"${w.toUniqueId().padTo(50, " ").mkString}status consist!\n")
} else {
- sb.append(s"${w.toUniqueId().padTo(50, " ")}status not consist!\n")
+ sb.append(s"${w.toUniqueId().padTo(50, " ").mkString}status not consist!\n")
}
- sb.append("======================================================================")
+ sb.append("=====================================================================\n")
}
sb.toString()
@@ -727,7 +727,7 @@ private[celeborn] class Master(
val sb = new StringBuilder
sb.append("======================= Lost Workers in Master ========================\n")
lostWorkersSnapshot.asScala.foreach { case (worker, time) =>
- sb.append(s"${worker.toUniqueId().padTo(50, " ")}$time\n")
+ sb.append(s"${worker.toUniqueId().padTo(50, " ").mkString}$time\n")
}
sb.toString()
}
@@ -761,7 +761,7 @@ private[celeborn] class Master(
val sb = new StringBuilder
sb.append("================= LifecycleManager Hostname List ======================\n")
statusSystem.appHeartbeatTime.asScala.foreach { case (appId, time) =>
- sb.append(s"${appId.padTo(40, " ")}$time\n")
+ sb.append(s"${appId.padTo(40, " ").mkString}$time\n")
}
sb.toString()
}
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 114bfdc1b..227b1b839 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
@@ -30,7 +30,7 @@ abstract class HttpService extends Service with Logging {
val maxKeyLength = conf.getAll.toMap.keys.map(_.length).max
sb.append("=========================== Configuration ============================\n")
conf.getAll.foreach { case (key, value) =>
- sb.append(key.padTo(maxKeyLength + 10, " ") + value + "\n")
+ sb.append(s"${key.padTo(maxKeyLength + 10, " ").mkString}$value\n")
}
sb.toString()
}
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 ec9677bd2..31fa80090 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
@@ -449,7 +449,7 @@ private[celeborn] class Worker(
override def getWorkerInfo: String = {
val sb = new StringBuilder
- sb.append("======================= WorkerInfo of Worker ============================")
+ sb.append("====================== WorkerInfo of Worker ===========================\n")
sb.append(workerInfo.toString()).append("\n")
sb.toString()
}
@@ -512,7 +512,7 @@ private[celeborn] class Worker(
val sb = new StringBuilder
sb.append("==================== Unavailable Peers of Worker =====================\n")
unavailablePeers.asScala.foreach { case (peer, time) =>
- sb.append(s"${peer.toUniqueId().padTo(50, " ")}$time\n")
+ sb.append(s"${peer.toUniqueId().padTo(50, " ").mkString}$time\n")
}
sb.toString()
}