diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala index 1a25800899..f794ad6f50 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala @@ -9,6 +9,7 @@ import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration._ import java.util.concurrent.ThreadLocalRandom + import org.scalatest.BeforeAndAfterEach import com.typesafe.config.Config import com.typesafe.config.ConfigFactory @@ -39,7 +40,9 @@ import akka.actor.ActorIdentity import akka.util.Helpers.ConfigOps import akka.util.Helpers.Requiring import java.lang.management.ManagementFactory + import akka.remote.RARP +import akka.remote.artery.ArterySettings.AeronUpd /** * This test is intended to be used as long running stress test @@ -126,11 +129,6 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig { akka.loggers = ["akka.testkit.TestEventListener"] akka.loglevel = INFO akka.remote.log-remote-lifecycle-events = off - - akka.remote.artery.advanced.aeron { - idle-cpu-level = 1 - } - akka.actor.default-dispatcher.fork-join-executor { parallelism-min = 8 parallelism-max = 8 @@ -723,6 +721,8 @@ abstract class StressSpec def isArteryEnabled: Boolean = RARP(system).provider.remoteSettings.Artery.Enabled + def isAeronUdpTransport: Boolean = RARP(system).provider.remoteSettings.Artery.Transport == AeronUpd + def jvmInfo(): String = { val runtime = ManagementFactory.getRuntimeMXBean val os = ManagementFactory.getOperatingSystemMXBean @@ -1169,9 +1169,9 @@ abstract class StressSpec enterBarrier("after-" + step) } - // FIXME issue #21810 + // Aeron UDP with embedded driver seems too heavy to get to pass // note: there must be one test step before pending, otherwise afterTermination will not run - if (isArteryEnabled) pending + if (isArteryEnabled && isAeronUdpTransport) pending "join seed nodes" taggedAs LongRunningTest in within(30 seconds) { diff --git a/akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala b/akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala index 5fb5031a14..d468dcf060 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala @@ -32,8 +32,7 @@ object RemotingFlightRecorder extends ExtensionId[RemotingFlightRecorder] with E (classOf[ExtendedActorSystem], system) :: Nil) match { case Success(jfr) => jfr case Failure(ex) => - system.log - .warning("Failed to load JFR remoting flight recorder, falling back to noop. Exception: {}", ex.getMessage) + system.log.warning("Failed to load JFR remoting flight recorder, falling back to noop. Exception: {}", ex) NoOpRemotingFlightRecorder } // fallback if not possible to dynamically load for some reason } else