viirya commented on code in PR #59707:
URL: https://github.com/apache/spark/pull/59707#discussion_r4349890887
##########
core/src/test/scala/org/apache/spark/util/ThreadUtilsSuite.scala:
##########
@@ -132,6 +132,111 @@ class ThreadUtilsSuite extends SparkFunSuite {
}
}
+ test("SPARK-60466: shutdown interrupts running tasks and drops queued tasks
after the " +
+ "grace period") {
+ val executor =
ThreadUtils.newDaemonSingleThreadExecutor("ThreadUtilsSuite-shutdown")
+ try {
+ val started = new CountDownLatch(1)
+ val interrupted = new CountDownLatch(1)
+ @volatile var queuedTaskRan = false
+ executor.execute(() => {
+ started.countDown()
+ try {
+ new CountDownLatch(1).await()
+ } catch {
+ case _: InterruptedException => interrupted.countDown()
+ }
+ })
+ executor.execute(() => queuedTaskRan = true)
+ assert(started.await(10, TimeUnit.SECONDS))
+
+ ThreadUtils.shutdown(executor, 100.milliseconds)
+ assert(interrupted.await(10, TimeUnit.SECONDS))
+ eventually(timeout(10.seconds)) {
+ assert(executor.isTerminated)
+ }
+ assert(!queuedTaskRan)
+ } finally {
+ executor.shutdownNow()
+ }
+ }
+
+ test("SPARK-60466: shutdown drops pending delayed tasks after the grace
period") {
+ val executor =
+
ThreadUtils.newDaemonSingleThreadScheduledExecutor("ThreadUtilsSuite-shutdown-delayed")
+ try {
+ // A scheduled executor still runs its delayed tasks after shutdown() by
default, so only
+ // shutdownNow() can terminate it before the delay elapses.
+ executor.schedule(new Runnable {
+ override def run(): Unit = {}
+ }, 1, TimeUnit.HOURS)
+
+ ThreadUtils.shutdown(executor, 100.milliseconds)
+ eventually(timeout(10.seconds)) {
+ assert(executor.isTerminated)
+ }
+ } finally {
+ executor.shutdownNow()
+ }
+ }
+
+ test("SPARK-60466: shutdown waits for tasks that finish within the grace
period") {
+ val executor =
ThreadUtils.newDaemonSingleThreadExecutor("ThreadUtilsSuite-shutdown-graceful")
+ try {
+ @volatile var interrupted = false
+ @volatile var queuedTaskRan = false
+ executor.execute(() => {
+ try {
+ Thread.sleep(500)
+ } catch {
+ case _: InterruptedException => interrupted = true
+ }
+ })
+ executor.execute(() => queuedTaskRan = true)
+
+ ThreadUtils.shutdown(executor, 1.minute)
+ assert(executor.isTerminated)
+ assert(!interrupted)
+ assert(queuedTaskRan)
+ } finally {
+ executor.shutdownNow()
+ }
+ }
+
+ test("SPARK-60466: shutdown forces termination when the calling thread is
interrupted") {
+ val executor =
+
ThreadUtils.newDaemonSingleThreadExecutor("ThreadUtilsSuite-shutdown-interrupted")
+ try {
+ val started = new CountDownLatch(1)
+ val interrupted = new CountDownLatch(1)
+ executor.execute(() => {
Review Comment:
nit: This blocking task (`started` latch, wait forever, count down
`interrupted` on interrupt) is the same as the one at line 142. A small helper
that submits it and returns the two latches would make each of these tests show
only what it is checking. Fine to leave as is.
--
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]
