Skip to content

[KUBERNETES] Prefer to use pod spark-app-name label as application name than pod name #7034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
turboFei wants to merge 1 commit into from
Closed

[KUBERNETES] Prefer to use pod spark-app-name label as application name than pod name #7034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions kyuubi-server/src/main/scala/org/apache/kyuubi/engine/KubernetesApplicationAuditLogger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import io.fabric8.kubernetes.api.model.Pod

import org.apache.kyuubi.Logging
import org.apache.kyuubi.config.KyuubiConf.KubernetesApplicationStateSource.KubernetesApplicationStateSource
import org.apache.kyuubi.engine.KubernetesApplicationOperation.{toApplicationStateAndError, LABEL_KYUUBI_UNIQUE_KEY, SPARK_APP_ID_LABEL}
import org.apache.kyuubi.engine.KubernetesApplicationOperation.{getPodAppId, getPodAppName, toApplicationStateAndError, LABEL_KYUUBI_UNIQUE_KEY}
import org.apache.kyuubi.engine.KubernetesResourceEventTypes.KubernetesResourceEventType

object KubernetesApplicationAuditLogger extends Logging {
Expand All @@ -49,7 +49,8 @@ object KubernetesApplicationAuditLogger extends Logging {
s"${containerState.getName}->${containerState.getState}"
}.mkString("[", ",", "]")
sb.append(s"containers=$containerStatuses").append("\t")
sb.append(s"appId=${pod.getMetadata.getLabels.get(SPARK_APP_ID_LABEL)}").append("\t")
sb.append(s"appId=${getPodAppId(pod)}").append("\t")
sb.append(s"appName=${getPodAppName(pod)}").append("\t")
val (appState, appError) =
toApplicationStateAndError(pod, appStateSource, appStateContainer, eventType)
sb.append(s"appState=$appState").append("\t")
Expand Down
19 changes: 14 additions & 5 deletions kyuubi-server/src/main/scala/org/apache/kyuubi/engine/KubernetesApplicationOperation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,16 +408,16 @@ class KubernetesApplicationOperation extends ApplicationOperation with Logging {
appInfoStore.put(
kyuubiUniqueKey,
kubernetesInfo -> appInfo.copy(
id = pod.getMetadata.getLabels.get(SPARK_APP_ID_LABEL),
name = pod.getMetadata.getName,
id = getPodAppId(pod),
name = getPodAppName(pod),
state = appState,
error = appError))
}.getOrElse {
appInfoStore.put(
kyuubiUniqueKey,
kubernetesInfo -> ApplicationInfo(
id = pod.getMetadata.getLabels.get(SPARK_APP_ID_LABEL),
name = pod.getMetadata.getName,
id = getPodAppId(pod),
name = getPodAppName(pod),
state = appState,
error = appError))
}
Expand Down Expand Up @@ -506,7 +506,8 @@ class KubernetesApplicationOperation extends ApplicationOperation with Logging {

object KubernetesApplicationOperation extends Logging {
val LABEL_KYUUBI_UNIQUE_KEY = "kyuubi-unique-tag"
val SPARK_APP_ID_LABEL = "spark-app-selector"
private val SPARK_APP_ID_LABEL = "spark-app-selector"
private val SPARK_APP_NAME_LABEL = "spark-app-name"
val KUBERNETES_SERVICE_HOST = "KUBERNETES_SERVICE_HOST"
val KUBERNETES_SERVICE_PORT = "KUBERNETES_SERVICE_PORT"
val SPARK_UI_PORT_NAME = "spark-ui"
Expand Down Expand Up @@ -634,4 +635,12 @@ object KubernetesApplicationOperation extends Logging {
.replace("{{KUBERNETES_NAMESPACE}}", kubernetesNamespace)
.replace("{{SPARK_UI_PORT}}", sparkUiPort.toString)
}

def getPodAppId(pod: Pod): String = {
pod.getMetadata.getLabels.get(SPARK_APP_ID_LABEL)
}

def getPodAppName(pod: Pod): String = {
Option(pod.getMetadata.getLabels.get(SPARK_APP_NAME_LABEL)).getOrElse(pod.getMetadata.getName)
}
}
Loading