From e020185b4a9f68b380df8ca9bea195c4a2895c0b Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 14:18:18 +0200 Subject: [PATCH 1/4] Update Java options as described in #5609 and #5550 --- desktop/package/package.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index 4f0e9bdb4a9..a9d65647022 100644 --- a/desktop/package/package.gradle +++ b/desktop/package/package.gradle @@ -231,7 +231,11 @@ task packageInstallers { " --main-jar ${mainJarName}" + " --main-class bisq.desktop.app.BisqAppMain" + " --java-options -Xss1280k" + - " --java-options -XX:MaxRAM=4g" + + " --java-options -XX:MaxRAM=6g" + + " --java-options -XX:+UseG1GC" + + " --java-options -XX:MaxHeapFreeRatio=10" + + " --java-options -XX:MinHeapFreeRatio=5" + + " --java-options -XX:+UseStringDeduplication" + " --java-options -Djava.net.preferIPv4Stack=true" // Warning: this will cause guice reflection exceptions and lead to issues with the guice internal cache // resulting in the UI not loading From 14d9ee493f2ea39be5f7d928d393bfe00cd5bbe8 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 15:48:26 +0200 Subject: [PATCH 2/4] Update remaining Java max ram default settings --- apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java | 4 ++-- build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java index 08a7531ca30..bebea12b25a 100644 --- a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java +++ b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java @@ -66,7 +66,7 @@ public enum BisqAppConfig { 49998), alicedesktop("bisq-BTC_REGTEST_Alice_dao", "bisq-desktop", - "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", + "-XX:MaxRAM=6g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", BisqAppMain.class.getName(), 7777, 5122, @@ -82,7 +82,7 @@ public enum BisqAppConfig { 49999), bobdesktop("bisq-BTC_REGTEST_Bob_dao", "bisq-desktop", - "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", + "-XX:MaxRAM=6g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", BisqAppMain.class.getName(), 8888, 5123, diff --git a/build.gradle b/build.gradle index 10761cadad2..bac687e3b9d 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,7 @@ configure([project(':cli'), if (applicationName == 'desktop') { def script = file("${rootProject.projectDir}/bisq-$applicationName") script.text = script.text.replace( - 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=4g"') + 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=6g"') } if (applicationName == 'apitest') { From 34127e9db4f8a5ed7a594eced58813177c7cc963 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 15:53:46 +0200 Subject: [PATCH 3/4] Add new JVM arguments also to build script --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bac687e3b9d..57a8375b0d4 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,9 @@ configure([project(':cli'), if (applicationName == 'desktop') { def script = file("${rootProject.projectDir}/bisq-$applicationName") script.text = script.text.replace( - 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=6g"') + 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=6g -Xss1280k -XX:+UseG1GC ' + + '-XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ' + + '-Djava.net.preferIPv4Stack=true"') } if (applicationName == 'apitest') { From 0b5f8edb1e425c411875500381d1d69ab7d69c7a Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 20:51:13 +0200 Subject: [PATCH 4/4] Increase MaxRam setting to 8g --- apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java | 4 ++-- build.gradle | 2 +- desktop/package/package.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java index bebea12b25a..eb0934d4a07 100644 --- a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java +++ b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java @@ -66,7 +66,7 @@ public enum BisqAppConfig { 49998), alicedesktop("bisq-BTC_REGTEST_Alice_dao", "bisq-desktop", - "-XX:MaxRAM=6g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", + "-XX:MaxRAM=8g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", BisqAppMain.class.getName(), 7777, 5122, @@ -82,7 +82,7 @@ public enum BisqAppConfig { 49999), bobdesktop("bisq-BTC_REGTEST_Bob_dao", "bisq-desktop", - "-XX:MaxRAM=6g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", + "-XX:MaxRAM=8g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", BisqAppMain.class.getName(), 8888, 5123, diff --git a/build.gradle b/build.gradle index 57a8375b0d4..6b51a0b86f8 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,7 @@ configure([project(':cli'), if (applicationName == 'desktop') { def script = file("${rootProject.projectDir}/bisq-$applicationName") script.text = script.text.replace( - 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=6g -Xss1280k -XX:+UseG1GC ' + + 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=8g -Xss1280k -XX:+UseG1GC ' + '-XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ' + '-Djava.net.preferIPv4Stack=true"') } diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index a9d65647022..aaba761f66c 100644 --- a/desktop/package/package.gradle +++ b/desktop/package/package.gradle @@ -231,7 +231,7 @@ task packageInstallers { " --main-jar ${mainJarName}" + " --main-class bisq.desktop.app.BisqAppMain" + " --java-options -Xss1280k" + - " --java-options -XX:MaxRAM=6g" + + " --java-options -XX:MaxRAM=8g" + " --java-options -XX:+UseG1GC" + " --java-options -XX:MaxHeapFreeRatio=10" + " --java-options -XX:MinHeapFreeRatio=5" +