[incubator-celeborn] branch main updated: [CELEBORN-512][IMPROVEMENT] Sort timestamp and show in date format (#1416)

[zh...@apache.org]

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

zhouky 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 f574a4daf [CELEBORN-512][IMPROVEMENT] Sort timestamp and show in date format (#1416)
f574a4daf is described below

commit f574a4dafa9769fa1106b19ba2308f03d48d6fa0
Author: Angerszhuuuu <an...@gmail.com>
AuthorDate: Tue Apr 11 19:56:48 2023 +0800

    [CELEBORN-512][IMPROVEMENT] Sort timestamp and show in date format (#1416)
---
 .../scala/org/apache/celeborn/service/deploy/master/Master.scala  | 8 ++++----
 .../scala/org/apache/celeborn/server/common/HttpService.scala     | 5 +++++
 .../scala/org/apache/celeborn/service/deploy/worker/Worker.scala  | 2 +-
 3 files changed, 10 insertions(+), 5 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 c8a81d11b..e2ab23144 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
@@ -714,8 +714,8 @@ private[celeborn] class Master(
   override def getLostWorkers: String = {
     val sb = new StringBuilder
     sb.append("======================= Lost Workers in Master ========================\n")
-    lostWorkersSnapshot.asScala.foreach { case (worker, time) =>
-      sb.append(s"${worker.toUniqueId().padTo(50, " ").mkString}$time\n")
+    lostWorkersSnapshot.asScala.toSeq.sortBy(_._2).foreach { case (worker, time) =>
+      sb.append(s"${worker.toUniqueId().padTo(50, " ").mkString}${simpleDateFormat.format(time)}\n")
     }
     sb.toString()
   }
@@ -757,8 +757,8 @@ private[celeborn] class Master(
   override def getApplicationList: String = {
     val sb = new StringBuilder
     sb.append("================= LifecycleManager Hostname List ======================\n")
-    statusSystem.appHeartbeatTime.asScala.foreach { case (appId, time) =>
-      sb.append(s"${appId.padTo(40, " ").mkString}$time\n")
+    statusSystem.appHeartbeatTime.asScala.toSeq.sortBy(_._2).foreach { case (appId, time) =>
+      sb.append(s"${appId.padTo(40, " ").mkString}${simpleDateFormat.format(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 0dc8c73a7..bc075c531 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
@@ -17,6 +17,9 @@
 
 package org.apache.celeborn.server.common
 
+import java.text.SimpleDateFormat
+import java.util.Locale
+
 import org.apache.celeborn.common.internal.Logging
 import org.apache.celeborn.server.common.http.{HttpRequestHandler, HttpServer, HttpServerInitializer}
 
@@ -24,6 +27,8 @@ abstract class HttpService extends Service with Logging {
 
   private var httpServer: HttpServer = _
 
+  protected val simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.ROOT)
+
   def getConf: String = {
     val sb = new StringBuilder
     val maxKeyLength = conf.getAll.toMap.keys.map(_.length).max
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 3371803b1..741cfb596 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
@@ -505,7 +505,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, " ").mkString}$time\n")
+      sb.append(s"${peer.toUniqueId().padTo(50, " ").mkString}${simpleDateFormat.format(time)}\n")
     }
     sb.toString()
   }