raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Re enable stress spec artery #28344

Browse source
This commit is contained in:
Johan Andrén 2020-01-08 16:24:28 +01:00 • committed by GitHub
parent 44cac83d0f
commit ed1f107ab1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
View file

@ -9,6 +9,7 @@ import scala.annotation.tailrec
import scala.collection.immutable import scala.collection.immutable
import scala.concurrent.duration._ import scala.concurrent.duration._
import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.ThreadLocalRandom
import org.scalatest.BeforeAndAfterEach import org.scalatest.BeforeAndAfterEach
import com.typesafe.config.Config import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigFactory
@ -39,7 +40,9 @@ import akka.actor.ActorIdentity
import akka.util.Helpers.ConfigOps import akka.util.Helpers.ConfigOps
import akka.util.Helpers.Requiring import akka.util.Helpers.Requiring
import java.lang.management.ManagementFactory import java.lang.management.ManagementFactory
import akka.remote.RARP import akka.remote.RARP
import akka.remote.artery.ArterySettings.AeronUpd
/** /**
* This test is intended to be used as long running stress test * 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.loggers = ["akka.testkit.TestEventListener"]
akka.loglevel = INFO akka.loglevel = INFO
akka.remote.log-remote-lifecycle-events = off akka.remote.log-remote-lifecycle-events = off
akka.remote.artery.advanced.aeron {
idle-cpu-level = 1
}
akka.actor.default-dispatcher.fork-join-executor { akka.actor.default-dispatcher.fork-join-executor {
parallelism-min = 8 parallelism-min = 8
parallelism-max = 8 parallelism-max = 8
@ -723,6 +721,8 @@ abstract class StressSpec
def isArteryEnabled: Boolean = RARP(system).provider.remoteSettings.Artery.Enabled def isArteryEnabled: Boolean = RARP(system).provider.remoteSettings.Artery.Enabled
def isAeronUdpTransport: Boolean = RARP(system).provider.remoteSettings.Artery.Transport == AeronUpd
def jvmInfo(): String = { def jvmInfo(): String = {
val runtime = ManagementFactory.getRuntimeMXBean val runtime = ManagementFactory.getRuntimeMXBean
val os = ManagementFactory.getOperatingSystemMXBean val os = ManagementFactory.getOperatingSystemMXBean
@ -1169,9 +1169,9 @@ abstract class StressSpec
enterBarrier("after-" + step) 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 // 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) { "join seed nodes" taggedAs LongRunningTest in within(30 seconds) {

3
akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala
View file

@ -32,8 +32,7 @@ object RemotingFlightRecorder extends ExtensionId[RemotingFlightRecorder] with E
(classOf[ExtendedActorSystem], system) :: Nil) match { (classOf[ExtendedActorSystem], system) :: Nil) match {
case Success(jfr) => jfr case Success(jfr) => jfr
case Failure(ex) => case Failure(ex) =>
system.log system.log.warning("Failed to load JFR remoting flight recorder, falling back to noop. Exception: {}", ex)
.warning("Failed to load JFR remoting flight recorder, falling back to noop. Exception: {}", ex.getMessage)
NoOpRemotingFlightRecorder NoOpRemotingFlightRecorder
} // fallback if not possible to dynamically load for some reason } // fallback if not possible to dynamically load for some reason
} else } else