ut

Author: turboFei

kyuubi-rest-client/src/main/java/org/apache/kyuubi/client/AdminRestApi.java

@@ -20,6 +20,7 @@
 import java.util.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kyuubi.client.api.v1.dto.Engine;
+import org.apache.kyuubi.client.api.v1.dto.KyuubiServerEvent;
 import org.apache.kyuubi.client.api.v1.dto.OperationData;
 import org.apache.kyuubi.client.api.v1.dto.ServerData;
 import org.apache.kyuubi.client.api.v1.dto.SessionData;
@@ -165,6 +166,12 @@ public List<ServerData> listServers() {
     return Arrays.asList(result);
   }
 
+  public KyuubiServerEvent getServerEvent() {
+    return this.getClient()
+        .get(
+            API_BASE_PATH + "/server/event", null, KyuubiServerEvent.class, client.getAuthHeader());
+  }
+
   private IRestClient getClient() {
     return this.client.getHttpClient();
   }

kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala

@@ -184,7 +184,6 @@ class KyuubiServer(name: String) extends Serverable(name) {
 
   def this() = this(classOf[KyuubiServer].getSimpleName)
 
-  private[kyuubi] var kyuubiServerInfoEvent: Option[KyuubiServerInfoEvent] = None
   override val backendService: AbstractBackendService =
     new KyuubiBackendService() with BackendServiceMetric
 
@@ -224,16 +223,18 @@ class KyuubiServer(name: String) extends Serverable(name) {
   override def start(): Unit = {
     super.start()
     KyuubiServer.kyuubiServer = this
-    kyuubiServerInfoEvent = KyuubiServerInfoEvent(this, ServiceState.STARTED)
-    kyuubiServerInfoEvent.foreach(EventBus.post)
+    KyuubiServerInfoEvent(this, ServiceState.STARTED).foreach(EventBus.post)
   }
 
   override def stop(): Unit = {
-    kyuubiServerInfoEvent = KyuubiServerInfoEvent(this, ServiceState.STOPPED)
-    kyuubiServerInfoEvent.foreach(EventBus.post)
+    KyuubiServerInfoEvent(this, ServiceState.STOPPED).foreach(EventBus.post)
     super.stop()
   }
 
+  def getServerEvent(): Option[KyuubiServerInfoEvent] = {
+    KyuubiServerInfoEvent(this, state)
+  }
+
   private def initLoggerEventHandler(conf: KyuubiConf): Unit = {
     ServerEventHandlerRegister.registerEventLoggers(conf)
   }

kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/ApiUtils.scala

@@ -138,6 +138,7 @@ object ApiUtils extends Logging {
   }
 
   def serverEvent(serverEvent: KyuubiServerInfoEvent): KyuubiServerEvent = {
+    if (serverEvent == null) return new KyuubiServerEvent()
     new KyuubiServerEvent(
       serverEvent.serverName,
       serverEvent.startTime,

kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/AdminResource.scala

@@ -406,13 +406,12 @@ private[v1] class AdminResource extends ApiRequestContext with Logging {
     content = Array(
       new Content(
         mediaType = MediaType.APPLICATION_JSON,
-        array = new ArraySchema(schema = new Schema(implementation =
-          classOf[KyuubiServerEvent])))),
+        schema = new Schema(implementation = classOf[KyuubiServerEvent]))),
     description = "Get the server event")
   @GET
   @Path("server/event")
-  def getServerEvent(): Seq[KyuubiServerEvent] = {
-    KyuubiServer.kyuubiServer.kyuubiServerInfoEvent.map(ApiUtils.serverEvent).toSeq
+  def getServerEvent(): KyuubiServerEvent = {
+    ApiUtils.serverEvent(KyuubiServer.kyuubiServer.getServerEvent().orNull)
   }
 
   private def normalizeEngineInfo(

kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala

@@ -849,9 +849,7 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
       .get
 
     assert(response.getStatus === 200)
-    val result = response.readEntity(new GenericType[Seq[KyuubiServerEvent]]() {})
-    assert(result.size == 1)
-    val serverEvent = result.head
+    val serverEvent = response.readEntity(classOf[KyuubiServerEvent])
     assert(serverEvent.getStartTime > 0)
   }
 }

kyuubi-server/src/test/scala/org/apache/kyuubi/server/rest/client/AdminRestApiSuite.scala

@@ -173,4 +173,14 @@ class AdminRestApiSuite extends RestClientTestHelper {
       assert(servers.map(s => s.getInstance()).contains(server.frontendServices.last.connectionUrl))
     }
   }
+
+  test("get server event") {
+    val spnegoKyuubiRestClient: KyuubiRestClient =
+      KyuubiRestClient.builder(baseUri.toString)
+        .authHeaderMethod(KyuubiRestClient.AuthHeaderMethod.SPNEGO)
+        .spnegoHost("localhost")
+        .build()
+    val adminRestApi = new AdminRestApi(spnegoKyuubiRestClient)
+    assert(adminRestApi.getServerEvent.getStartTime > 0)
+  }
 }