Skip to content

[KYUUBI #2419] Release engine during closing kyuubi server session if share level is connection #2482

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
wForget wants to merge 3 commits into from
Closed

[KYUUBI #2419] Release engine during closing kyuubi server session if share level is connection #2482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fe3c2f
[KYUUBI-2419] Destroy the ProcBuilder process and call killApplicatio…
wForget Apr 26, 2022
ae8be05
revert BatchJobSubmission
wForget Apr 27, 2022
2690b5d
comment
wForget Apr 28, 2022
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
17 changes: 16 additions & 1 deletion kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ private[kyuubi] class EngineRef(

private val clientPoolName: String = conf.get(ENGINE_POOL_NAME)

private var builder: ProcBuilder = _

@VisibleForTesting
private[kyuubi] val subdomain: String = conf.get(ENGINE_SHARE_LEVEL_SUBDOMAIN) match {
case Some(_subdomain) => _subdomain
Expand Down Expand Up @@ -162,7 +164,7 @@ private[kyuubi] class EngineRef(
conf.set(HA_ZK_ENGINE_REF_ID, engineRefId)
val started = System.currentTimeMillis()
conf.set(KYUUBI_ENGINE_SUBMIT_TIME_KEY, String.valueOf(started))
val builder = engineType match {
builder = engineType match {
case SPARK_SQL =>
conf.setIfMissing(SparkProcessBuilder.APP_KEY, defaultEngineName)
new SparkProcessBuilder(appUser, conf, extraEngineLog)
Expand Down Expand Up @@ -230,4 +232,17 @@ private[kyuubi] class EngineRef(
create(discoveryClient, extraEngineLog)
}
}

def close(): Unit = {
if (shareLevel == CONNECTION && builder != null) {
try {
val clusterManager = builder.clusterManager()
builder.close(true)
engineManager.killApplication(clusterManager, engineRefId)
} catch {
case e: Exception =>
warn(s"Error closing engine builder, engineRefId: $engineRefId", e)
}
}
}
}
4 changes: 2 additions & 2 deletions kyuubi-server/src/main/scala/org/apache/kyuubi/engine/ProcBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,12 @@ trait ProcBuilder {
process
}

def close(): Unit = synchronized {
def close(destroyProcess: Boolean = !waitCompletion): Unit = synchronized {
if (logCaptureThread != null) {
logCaptureThread.interrupt()
logCaptureThread = null
}
if (!waitCompletion && process != null) {
if (destroyProcess && process != null) {
info("Destroy the process, since waitCompletion is false.")
process.destroyForcibly()
process = null
Expand Down
1 change: 1 addition & 0 deletions kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ class KyuubiSessionImpl(
try {
if (_client != null) _client.closeSession()
} finally {
if (engine != null) engine.close()
sessionEvent.endTime = System.currentTimeMillis()
EventBus.post(sessionEvent)
MetricsSystem.tracing(_.decCount(MetricRegistry.name(CONN_OPEN, user)))
Expand Down