From 862e925d7c4fd595dd684eb81aee2deff1eb6346 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Sun, 26 Mar 2023 21:37:11 +0200 Subject: [PATCH] "-Dsmall-ram=TRUE" no longer does anything. Remove references to the flag, which previously reduced the memory footprint of the loader and index service. --- .../index/svc/IndexQueryServiceIntegrationTestModule.java | 1 - docker-service.gradle | 2 +- run/reconvert.sh | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java index 555492bd..a2962027 100644 --- a/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java +++ b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java @@ -45,7 +45,6 @@ public class IndexQueryServiceIntegrationTestModule extends AbstractModule { @Override protected void configure() { - System.setProperty("small-ram", "true"); try { var servicesFactory = new IndexServicesFactory(Path.of("/tmp"), slowDir, fastDir diff --git a/docker-service.gradle b/docker-service.gradle index 15086ce7..8468175b 100644 --- a/docker-service.gradle +++ b/docker-service.gradle @@ -1,6 +1,6 @@ ext { dockerImage='openjdk:17-slim' - serviceJvmOpts='-Dservice-host=0.0.0.0 -ea -Dsmall-ram=true ${wmsa_jvm_param} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=4000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false' + serviceJvmOpts='-Dservice-host=0.0.0.0 -ea ${wmsa_jvm_param} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=4000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false' serviceToolOpts='-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000' } diff --git a/run/reconvert.sh b/run/reconvert.sh index b0319b9d..568af360 100755 --- a/run/reconvert.sh +++ b/run/reconvert.sh @@ -18,7 +18,6 @@ CONVERTER_PROCESS_OPTS=" LOADER_PROCESS_OPTS=" -ea --Dsmall-ram=TRUE -Dlocal-index-path=vol/iw "