pan3793 commented on code in PR #5243:
URL: https://github.com/apache/kyuubi/pull/5243#discussion_r1314427488
##########
kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiBatchSession.scala:
##########
@@ -142,32 +145,47 @@ class KyuubiBatchSession(
override def open(): Unit = handleSessionException {
traceMetricsOnOpen()
- if (recoveryMetadata.isEmpty) {
+ lazy val kubernetesInfo: Map[String, String] = {
val appMgrInfo = batchJobSubmissionOp.builder.appMgrInfo()
- val kubernetesInfo = appMgrInfo.kubernetesInfo.context.map { context =>
+ appMgrInfo.kubernetesInfo.context.map { context =>
Map(KyuubiConf.KUBERNETES_CONTEXT.key -> context)
}.getOrElse(Map.empty) ++ appMgrInfo.kubernetesInfo.namespace.map {
namespace =>
Map(KyuubiConf.KUBERNETES_NAMESPACE.key -> namespace)
}.getOrElse(Map.empty)
- val metaData = Metadata(
- identifier = handle.identifier.toString,
- sessionType = sessionType,
- realUser = realUser,
- username = user,
- ipAddress = ipAddress,
- kyuubiInstance = connectionUrl,
- state = OperationState.PENDING.toString,
- resource = resource,
- className = className,
- requestName = name.orNull,
- requestConf = optimizedConf ++ kubernetesInfo, // save the kubernetes
info into request conf
- requestArgs = batchArgs,
- createTime = createTime,
- engineType = batchType,
- clusterManager = batchJobSubmissionOp.builder.clusterManager())
-
- // there is a chance that operation failed w/ duplicated key error
- sessionManager.insertMetadata(metaData)
+ }
+
+ (metadata, fromRecovery) match {
+ case (Some(initialMetadata), false) =>
+ // new batch job created using batch impl v2
+ val metadataToUpdate = Metadata(
+ identifier = initialMetadata.identifier,
+ kyuubiInstance = connectionUrl,
+ requestName = name.orNull,
+ requestConf = optimizedConf ++ kubernetesInfo, // save the
kubernetes info
+ clusterManager = batchJobSubmissionOp.builder.clusterManager())
+ sessionManager.updateMetadata(metadataToUpdate)
Review Comment:
this is the key change: update metadata created by batch impl v2 before
opening batch session
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
