Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import java.io.{File, FileOutputStream, StringReader}
import java.net.URI
import java.nio.file.Paths
import java.util.concurrent.CountDownLatch
import java.util.concurrent.atomic.AtomicInteger
import javax.servlet.http.{HttpServletRequest, HttpServletResponse}

import com.google.common.base.Charsets
Expand Down Expand Up @@ -101,6 +102,7 @@ private[spark] class KubernetesSparkRestServer(
conf: SparkConf,
expectedApplicationSecret: Array[Byte],
shutdownLock: CountDownLatch,
exitCode: AtomicInteger,
sslOptions: SSLOptions = new SSLOptions)
extends RestSubmissionServer(host, port, conf, sslOptions) {

Expand Down Expand Up @@ -238,7 +240,8 @@ private[spark] class KubernetesSparkRestServer(
})
waitForProcessCompleteExecutor.submit(new Runnable {
override def run(): Unit = {
process.waitFor
// set the REST service's exit code to the exit code of the driver subprocess
exitCode.set(process.waitFor)
SERVLET_LOCK.synchronized {
logInfo("Spark application complete. Shutting down submission server...")
KubernetesSparkRestServer.this.stop
Expand Down Expand Up @@ -355,12 +358,14 @@ private[spark] object KubernetesSparkRestServer {
}
val secretBytes = Files.toByteArray(secretFile)
val sparkConf = new SparkConf(true)
val exitCode = new AtomicInteger(0)
val server = new KubernetesSparkRestServer(
parsedArguments.host.get,
parsedArguments.port.get,
sparkConf,
secretBytes,
barrier,
exitCode,
sslOptions)
server.start()
ShutdownHookManager.addShutdownHook(() => {
Expand All @@ -371,6 +376,7 @@ private[spark] object KubernetesSparkRestServer {
}
})
barrier.await()
System.exit(exitCode.get())
}
}