Skip to content

Commit

Permalink
misc: revert to using -Xmx2G for forked jvms
Browse files Browse the repository at this point in the history
  • Loading branch information
Szymon Matejczyk committed Sep 12, 2020
1 parent 59aa64a commit fc36d93
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions project/FiloSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ object FiloSettings {
// Uncomment below to debug Typesafe Config file loading
// javaOptions ++= List("-Xmx2G", "-Dconfig.trace=loads"),
// Make Akka tests more resilient esp for CI/CD/Travis/etc.
javaOptions ++= List("-Xmx4G", "-XX:+CMSClassUnloadingEnabled", "-Dakka.test.timefactor=3"),
javaOptions ++= List("-Xmx2G", "-XX:+CMSClassUnloadingEnabled", "-Dakka.test.timefactor=3"),
// Needed to avoid cryptic EOFException crashes in forked tests
// in Travis with `sudo: false`.
// See https://github.com/sbt/sbt/issues/653
Expand All @@ -136,7 +136,7 @@ object FiloSettings {
internalDependencyClasspath in IntegrationTest, exportedProducts in Test)).value)

lazy val multiJvmSettings = SbtMultiJvm.multiJvmSettings ++ Seq(
javaOptions in MultiJvm := Seq("-Xmx4G", "-Dakka.test.timefactor=3"),
javaOptions in MultiJvm := Seq("-Xmx2G", "-Dakka.test.timefactor=3"),
compile in MultiJvm := ((compile in MultiJvm) triggeredBy (compile in Test)).value)

lazy val testMultiJvmToo = Seq(
Expand Down Expand Up @@ -194,7 +194,7 @@ object FiloSettings {
config="-Dconfig.file=$FILO_CONFIG_FILE"
fi
: ${FILOLOG:="."}
exec $CMD -Xmx4g -Xms1g -DLOG_DIR=$FILOLOG $config $allprops -jar "$0" "$@" ;
exec $CMD -Xmx2g -Xms1g -DLOG_DIR=$FILOLOG $config $allprops -jar "$0" "$@" ;
""".split("\n")

lazy val kafkaSettings = Seq(
Expand Down

0 comments on commit fc36d93

Please sign in to comment.