ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-36725][SQL][TESTS] Ensure HiveThriftServer2Suites to stop Thrift JDBC server on exit

Browse source 
### What changes were proposed in this pull request?

This PR aims to ensure that HiveThriftServer2Suites (e.g. `thriftserver.UISeleniumSuite`) stop Thrift JDBC server on exit using shutdown hook.

### Why are the changes needed?

Normally, HiveThriftServer2Suites stops Thrift JDBC server via `afterAll` method.
But, if they are killed by signal (e.g. Ctrl-C), Thrift JDBC server will be remain.
```
$ jps
2792969 SparkSubmit
```
### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?

Killed `thriftserver.UISeleniumSuite` by Ctrl-C and confirmed no Thrift JDBC server is remain by jps.

Closes #33967 from sarutak/stop-thrift-on-exit.

Authored-by: Kousuke Saruta <sarutak@oss.nttdata.com>
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
(cherry picked from commit c36d70836d)
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
This commit is contained in:
Kousuke Saruta 2021-09-11 15:54:35 -07:00 committed by Dongjoon Hyun
parent d71e2fd1d1
commit b8a23e9ccc
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suites.scala
View file

@ -50,7 +50,7 @@ import org.apache.spark.sql.hive.test.HiveTestJars
import org.apache.spark.sql.internal.SQLConf import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.internal.StaticSQLConf.HIVE_THRIFT_SERVER_SINGLESESSION import org.apache.spark.sql.internal.StaticSQLConf.HIVE_THRIFT_SERVER_SINGLESESSION
import org.apache.spark.sql.test.ProcessTestUtils.ProcessOutputCapturer import org.apache.spark.sql.test.ProcessTestUtils.ProcessOutputCapturer
import org.apache.spark.util.{ThreadUtils, Utils} import org.apache.spark.util.{ShutdownHookManager, ThreadUtils, Utils}
object TestData { object TestData {
def getTestDataFilePath(name: String): URL = { def getTestDataFilePath(name: String): URL = {
@ -1338,10 +1338,12 @@ abstract class HiveThriftServer2TestBase extends SparkFunSuite with BeforeAndAft
process process
} }
ShutdownHookManager.addShutdownHook(stopThriftServer _)
ThreadUtils.awaitResult(serverStarted.future, SERVER_STARTUP_TIMEOUT) ThreadUtils.awaitResult(serverStarted.future, SERVER_STARTUP_TIMEOUT)
} }
private def stopThriftServer(): Unit = { private def stopThriftServer(): Unit = {
if (pidDir.list.nonEmpty) {
// The `spark-daemon.sh' script uses kill, which is not synchronous, have to wait for a while. // The `spark-daemon.sh' script uses kill, which is not synchronous, have to wait for a while.
Utils.executeAndGetOutput( Utils.executeAndGetOutput(
command = Seq(stopScript), command = Seq(stopScript),
@ -1366,6 +1368,7 @@ abstract class HiveThriftServer2TestBase extends SparkFunSuite with BeforeAndAft
Option(logTailingProcess).foreach(_.destroy()) Option(logTailingProcess).foreach(_.destroy())
logTailingProcess = null logTailingProcess = null
} }
}
private def dumpLogs(): Unit = { private def dumpLogs(): Unit = {
logError( logError(