Add app name column

Author: turboFei

kyuubi-server/src/main/scala/org/apache/kyuubi/engine/KubernetesApplicationOperation.scala

@@ -469,7 +469,8 @@ class KubernetesApplicationOperation extends ApplicationOperation with Logging {
         context = kubernetesInfo.context,
         namespace = kubernetesInfo.namespace,
         podName = pod.getMetadata.getName,
-        appId = pod.getMetadata.getLabels.get(SPARK_APP_ID_LABEL),
+        appId = getPodAppId(pod),
+        appName = getPodAppName(pod),
         appState = appState.toString,
         appError = appError)))
     if (cleanupTerminatedAppInfoTrigger.getIfPresent(key) == null) {

kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/MetadataManager.scala

@@ -136,8 +136,12 @@ class MetadataManager extends AbstractService("MetadataManager") {
   }
 
   def getKubernetesApplicationInfo(identifier: String): Option[ApplicationInfo] = {
-    Option(withMetadataRequestMetrics(
-      _metadataStore.getKubernetesMetadata(identifier))).map(buildApplicationInfo)
+    Option(withMetadataRequestMetrics(_metadataStore.getKubernetesMetadata(identifier))).map {
+      metadata =>
+        val appInfo = buildApplicationInfo(metadata)
+        info(s"Retrieve $appInfo from kubernetes metadata store: $metadata")
+        appInfo
+    }
   }
 
   def getBatches(
@@ -380,7 +384,7 @@ object MetadataManager extends Logging {
   def buildApplicationInfo(metadata: KubernetesMetadata): ApplicationInfo = {
     ApplicationInfo(
       id = metadata.appId,
-      name = metadata.podName,
+      name = metadata.appName,
       state = ApplicationState.withName(metadata.appState),
       error = metadata.appError)
   }

kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/api/KubernetesMetadata.scala

@@ -25,6 +25,7 @@ package org.apache.kyuubi.server.metadata.api
  * @param namespace the kubernetes namespace.
  * @param podName the kubernetes pod name.
  * @param appId the application id.
+ * @param appName the application name.
  * @param appState the application state.
  * @param appError the application error diagnose.
  * @param createTime the metadata create time.
@@ -36,6 +37,7 @@ case class KubernetesMetadata(
     namespace: Option[String],
     podName: String,
     appId: String,
+    appName: String,
     appState: String,
     appError: Option[String],
     createTime: Long = 0L,

kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala

@@ -428,12 +428,13 @@ class JDBCMetadataStore(conf: KyuubiConf) extends MetadataStore with Logging {
          |namespace,
          |pod_name,
          |app_id,
+         |app_name,
          |app_state,
          |app_error,
          |create_time,
          |update_time
          |)
-         |SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?
+         |SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
          |WHERE NOT EXISTS (
          |  SELECT 1 FROM $KUBERNETES_METADATA_TABLE WHERE identifier = ?
          |)
@@ -448,6 +449,7 @@ class JDBCMetadataStore(conf: KyuubiConf) extends MetadataStore with Logging {
         metadata.namespace.orNull,
         metadata.podName,
         metadata.appId,
+        metadata.appName,
         metadata.appState,
         metadata.appError.orNull,
         currentTime,
@@ -478,6 +480,10 @@ class JDBCMetadataStore(conf: KyuubiConf) extends MetadataStore with Logging {
       setClauses += "app_id = ?"
       params += appId
     }
+    Option(metadata.appName).foreach { appName =>
+      setClauses += "app_name = ?"
+      params += appName
+    }
     Option(metadata.appState).foreach { appState =>
       setClauses += "app_state = ?"
       params += appState
@@ -605,6 +611,7 @@ class JDBCMetadataStore(conf: KyuubiConf) extends MetadataStore with Logging {
         val namespace = Option(resultSet.getString("namespace"))
         val pod = resultSet.getString("pod_name")
         val appId = resultSet.getString("app_id")
+        val appName = resultSet.getString("app_name")
         val appState = resultSet.getString("app_state")
         val appError = Option(resultSet.getString("app_error"))
         val createTime = resultSet.getLong("create_time")
@@ -616,6 +623,7 @@ class JDBCMetadataStore(conf: KyuubiConf) extends MetadataStore with Logging {
           namespace = namespace,
           podName = pod,
           appId = appId,
+          appName = appName,
           appState = appState,
           appError = appError,
           createTime = createTime,
@@ -766,6 +774,7 @@ object JDBCMetadataStore {
     "namespace",
     "pod_name",
     "app_id",
+    "app_name",
     "app_state",
     "app_error",
     "create_time",

kyuubi-server/src/test/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreSuite.scala

@@ -278,6 +278,7 @@ class JDBCMetadataStoreSuite extends KyuubiFunSuite {
       namespace = Some("namespace"),
       podName = "podName",
       appId = "appId",
+      appName = "appName",
       appState = "FINISHED",
       appError = Some("appError"))
 
@@ -289,6 +290,7 @@ class JDBCMetadataStoreSuite extends KyuubiFunSuite {
     assert(metadata2.namespace == metadata.namespace)
     assert(metadata2.podName == metadata.podName)
     assert(metadata2.appId == metadata.appId)
+    assert(metadata2.appName == metadata.appName)
     assert(metadata2.appState == metadata.appState)
     assert(metadata2.appError == metadata.appError)
     assert(metadata2.createTime > 0)
@@ -300,6 +302,7 @@ class JDBCMetadataStoreSuite extends KyuubiFunSuite {
       namespace = Some("namespace2"),
       podName = "podName2",
       appId = "appId2",
+      appName = "appName2",
       appState = "FAILED",
       appError = Some("appError2"))
     jdbcMetadataStore.upsertKubernetesMetadata(metadata3)
@@ -310,6 +313,7 @@ class JDBCMetadataStoreSuite extends KyuubiFunSuite {
     assert(metadata4.namespace == metadata3.namespace)
     assert(metadata4.podName == metadata3.podName)
     assert(metadata4.appId == metadata3.appId)
+    assert(metadata4.appName == metadata3.appName)
     assert(metadata4.appState == metadata3.appState)
     assert(metadata4.appError == metadata3.appError)
     assert(metadata4.createTime == metadata2.createTime)
@@ -318,7 +322,7 @@ class JDBCMetadataStoreSuite extends KyuubiFunSuite {
     val applicationInfo =
       MetadataManager.buildApplicationInfo(jdbcMetadataStore.getKubernetesMetadata(tag))
     assert(applicationInfo.id == "appId2")
-    assert(applicationInfo.name == "podName2")
+    assert(applicationInfo.name == "appName2")
     assert(applicationInfo.state == ApplicationState.FAILED)
     assert(applicationInfo.error == Some("appError2"))