apache/kyuubi
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[KYUUBI #7034][FOLLOWUP] Decouple the kubernetes pod name and app name

Browse Source 
### Why are the changes needed?

Followup for #7034  to fix the SparkOnKubernetesTestsSuite.

Sorry, I forget that the appInfo name and pod name were deeply bound before, the appInfo name was used as pod name and used to delete pod.

In this PR, we add `podName` into applicationInfo to separate app name and pod name.

### How was this patch tested?

GA should pass.

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes #7039 from turboFei/fix_test.

Closes #7034

0ff7018d6 [Wang, Fei] revert
18e48c079 [Wang, Fei] comments
19f34bc83 [Wang, Fei] do not get pod name from appName
c1d308437 [Wang, Fei] reduce interval for test stability
50fad6bc5 [Wang, Fei] fix ut

Authored-by: Wang, Fei <fwang12@ebay.com>
Signed-off-by: Wang, Fei <fwang12@ebay.com>
This commit is contained in:
Wang, Fei 2025-04-24 22:40:28 -07:00
parent ba854d3c99
commit 75891d1a92
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/spark/SparkOnKubernetesTestsSuite.scala
View File

@ -230,7 +230,7 @@ class KyuubiOperationKubernetesClusterClusterModeSuite
appMgrInfo,
sessionHandle.identifier.toString)
assert(appInfo.state == RUNNING)
assert(appInfo.name.startsWith(driverPodNamePrefix))
assert(appInfo.podName.exists(_.startsWith(driverPodNamePrefix)))
}
val killResponse = k8sOperation.killApplicationByTag(

7
kyuubi-server/src/main/scala/org/apache/kyuubi/engine/ApplicationOperation.scala
View File

@ -113,7 +113,9 @@ case class ApplicationInfo(
name: String,
state: ApplicationState,
url: Option[String] = None,
error: Option[String] = None) {
error: Option[String] = None,
// only used for K8s and still possible to be None for cases like NOT_FOUND state for K8s cases
podName: Option[String] = None) {
def toMap: Map[String, String] = {
Map(
@ -121,7 +123,8 @@ case class ApplicationInfo(
"name" -> name,
"state" -> state.toString,
"url" -> url.orNull,
"error" -> error.orNull)
"error" -> error.orNull) ++
podName.map("podName" -> _).toMap
}
}

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

@ -139,7 +139,7 @@ class KubernetesApplicationOperation extends ApplicationOperation with Logging {
case COMPLETED => !ApplicationState.isFailed(notification.getValue)
}
if (shouldDelete) {
deletePod(kubernetesInfo, removed.name, appLabel)
deletePod(kubernetesInfo, removed.podName.orNull, appLabel)
}
info(s"Remove terminated application $removed with ${toLabel(appLabel)}")
}
@ -218,8 +218,13 @@ class KubernetesApplicationOperation extends ApplicationOperation with Logging {
false,
s"[$kubernetesInfo] Target application[${toLabel(tag)}] is in ${info.state} state")
case _ =>
val deleted = info.podName match {
case Some(podName) => !kubernetesClient.pods.withName(podName).delete().isEmpty
case None =>
!kubernetesClient.pods.withLabel(LABEL_KYUUBI_UNIQUE_KEY, tag).delete().isEmpty
}
(
!kubernetesClient.pods.withName(info.name).delete().isEmpty,
deleted,
s"[$kubernetesInfo] Operation of deleted" +
s" application[appId: ${info.id}, ${toLabel(tag)}] is completed")
}
@ -410,7 +415,8 @@ class KubernetesApplicationOperation extends ApplicationOperation with Logging {
id = getPodAppId(pod),
name = getPodAppName(pod),
state = appState,
error = appError))
error = appError,
podName = Some(pod.getMetadata.getName)))
}.getOrElse {
appInfoStore.put(
kyuubiUniqueKey,
@ -418,7 +424,8 @@ class KubernetesApplicationOperation extends ApplicationOperation with Logging {
id = getPodAppId(pod),
name = getPodAppName(pod),
state = appState,
error = appError))
error = appError,
podName = Some(pod.getMetadata.getName)))
}
}
}