Terminates actor systems in parallel (#29606)

This commit is contained in:
Ignasi Marimon-Clos 2020-09-16 13:33:48 +02:00 committed by GitHub
parent ffc4235980
commit 5ea4c1751c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -25,15 +25,12 @@ import akka.remote.artery.tcp.SSLEngineProviderSetup
import akka.remote.artery.tcp.TlsTcpSpec import akka.remote.artery.tcp.TlsTcpSpec
import akka.testkit.ImplicitSender import akka.testkit.ImplicitSender
import akka.testkit.TestActors import akka.testkit.TestActors
import akka.testkit.TestDuration
import akka.testkit.TestProbe import akka.testkit.TestProbe
import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigFactory
import javax.net.ssl.SSLContext import javax.net.ssl.SSLContext
import javax.net.ssl.SSLEngine import javax.net.ssl.SSLEngine
import javax.net.ssl.SSLSession import javax.net.ssl.SSLSession
import scala.concurrent.duration._
import scala.concurrent.Await
import scala.concurrent.blocking import scala.concurrent.blocking
import scala.util.control.NonFatal import scala.util.control.NonFatal
@ -271,11 +268,9 @@ abstract class RotatingKeysSSLEngineProviderSpec(extraConfig: String)
override def beforeTermination(): Unit = { override def beforeTermination(): Unit = {
systemsToTerminate.foreach { systemToTerminate => systemsToTerminate.foreach { systemToTerminate =>
system.log.info(s"Terminating $systemToTerminate...") system.log.info(s"Terminating $systemToTerminate...")
val now = System.nanoTime() systemToTerminate.terminate()
Await.result(systemToTerminate.terminate(), 8.seconds.dilated)
val lasted = System.nanoTime() - now
system.log.info(s"Terminated $systemToTerminate after ${lasted / 1000000} ms")
} }
systemsToTerminate.foreach(shutdown(_, verifySystemShutdown = true))
super.beforeTermination() super.beforeTermination()
} }