mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-01-19 14:44:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve maxMemory check and restart process

Browse Source
This commit is contained in:
Manfred Karrer 2017-12-07 22:22:15 -05:00
parent ba90e20e43
commit 5117fa93f0
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
seednode/src/main/java/io/bisq/seednode/SeedNodeMain.java
View File

@ -31,8 +31,6 @@ import joptsimple.OptionSet;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.bitcoinj.store.BlockStoreException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Locale;
@ -44,7 +42,6 @@ import static io.bisq.core.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
@Slf4j
public class SeedNodeMain extends BisqExecutable {
private static final Logger log = LoggerFactory.getLogger(SeedNodeMain.class);
private static final long MAX_MEMORY_MB_DEFAULT = 500;
private static final long CHECK_MEMORY_PERIOD_SEC = 5 * 60;
private SeedNode seedNode;
@ -141,23 +138,21 @@ public class SeedNodeMain extends BisqExecutable {
UserThread.runPeriodically(() -> {
Profiler.printSystemLoad(log);
long usedMemoryInMB = Profiler.getUsedMemoryInMB();
if (!stopped) {
if (usedMemoryInMB > (maxMemory - 100)) {
long usedMemoryInMB = Profiler.getUsedMemoryInMB();
if (usedMemoryInMB > (maxMemory * 0.8)) {
log.warn("\n\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
"We are over our memory warn limit and call the GC. usedMemoryInMB: {}" +
"\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\n",
usedMemoryInMB);
System.gc();
usedMemoryInMB = Profiler.getUsedMemoryInMB();
Profiler.printSystemLoad(log);
}
final long finalUsedMemoryInMB = usedMemoryInMB;
UserThread.runAfter(() -> {
if (finalUsedMemoryInMB > maxMemory)
if (Profiler.getUsedMemoryInMB() > maxMemory)
restart(bisqEnvironment);
}, 1);
}, 5);
}
}, CHECK_MEMORY_PERIOD_SEC);

9
statistics/src/main/java/io/bisq/statistics/StatisticsMain.java
View File

@ -133,20 +133,19 @@ public class StatisticsMain extends BisqExecutable {
UserThread.runPeriodically(() -> {
Profiler.printSystemLoad(log);
long usedMemoryInMB = Profiler.getUsedMemoryInMB();
if (!stopped) {
if (usedMemoryInMB > (maxMemory - 100)) {
long usedMemoryInMB = Profiler.getUsedMemoryInMB();
if (usedMemoryInMB > (maxMemory * 0.8)) {
log.warn("\n\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
"We are over our memory warn limit and call the GC. usedMemoryInMB: {}" +
"\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\n",
usedMemoryInMB);
System.gc();
usedMemoryInMB = Profiler.getUsedMemoryInMB();
Profiler.printSystemLoad(log);
}
final long finalUsedMemoryInMB = usedMemoryInMB;
UserThread.runAfter(() -> {
final long finalUsedMemoryInMB = Profiler.getUsedMemoryInMB();
if (finalUsedMemoryInMB > maxMemory) {
log.error("\n\n############################################################\n" +
"We shut down as we are over our memory limit. usedMemoryInMB: {}" +
@ -154,7 +153,7 @@ public class StatisticsMain extends BisqExecutable {
finalUsedMemoryInMB);
System.exit(EXIT_FAILURE);
}
}, 1);
}, 5);
}
}, CHECK_MEMORY_PERIOD_SEC);