LDEV-5246 disabled controller System.GC() by default

lucee · Jan 11, 2025 · 6c443a3 · 6c443a3
1 parent fb11c28
commit 6c443a3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/core/src/main/java/lucee/runtime/engine/Controler.java b/core/src/main/java/lucee/runtime/engine/Controler.java
@@ -82,7 +82,8 @@ public final class Controler extends ParentThreasRefThread {
 	// private final ShutdownHook shutdownHook;
 	private ControllerState state;
 
-	private boolean poolValidate;
+	//private boolean poolValidate;
+	private boolean enableGC;
 
 	/**
 	 * @param contextes
@@ -94,7 +95,8 @@ public Controler(ConfigServer configServer, Map contextes, int interval, Control
 		this.interval = interval;
 		this.state = state;
 		this.configServer = configServer;
-		this.poolValidate = Caster.toBooleanValue(SystemUtil.getSystemPropOrEnvVar("lucee.datasource.pool.validate", null), true);
+		//this.poolValidate = Caster.toBooleanValue(SystemUtil.getSystemPropOrEnvVar("lucee.datasource.pool.validate", null), true);
+		this.enableGC = Caster.toBooleanValue(SystemUtil.getSystemPropOrEnvVar("lucee.controller.gc", null), false);
 		// shutdownHook=new ShutdownHook(configServer);
 		// Runtime.getRuntime().addShutdownHook(shutdownHook);
 	}
@@ -276,17 +278,6 @@ private void control(CFMLFactoryImpl[] factories, boolean firstRun, Log log) {
 			}
 		}
 
-		// every 5 minutes
-		if (do5Minute) {
-			try {
-				System.gc();
-			}
-			catch (Throwable t) {
-				ExceptionUtil.rethrowIfNecessary(t);
-				if (log != null) log.error("controler", t);
-			}
-		}
-
 		for (int i = 0; i < factories.length; i++) {
 			control(factories[i], do10Seconds, doMinute, doHour, firstRun, log);
 		}
@@ -308,6 +299,17 @@ private void control(CFMLFactoryImpl[] factories, boolean firstRun, Log log) {
 				if (log != null) log.error("controler", e);
 			}
 		}
+
+		// every 5 minutes
+		if (this.enableGC && do5Minute) {
+			try {
+				System.gc();
+			}
+			catch (Throwable t) {
+				ExceptionUtil.rethrowIfNecessary(t);
+				if (log != null) log.error("controler", t);
+			}
+		}
 	}
 
 	private void control(CFMLFactoryImpl cfmlFactory, boolean do10Seconds, boolean doMinute, boolean doHour, boolean firstRun, Log log) {

diff --git a/core/src/main/java/resource/setting/sysprop-envvar.json b/core/src/main/java/resource/setting/sysprop-envvar.json
@@ -149,6 +149,11 @@
         "envvar": "LUCEE_CONTROLLER_DISABLED",
         "desc": ""
     },
+    {
+        "sysprop": "lucee.controller.gc",
+        "envvar": "LUCEE_CONTROLLER_GC",
+        "desc": "Default false, previously Lucee always ran a System.GC() every 5 minutes, available since 6.2"
+    },
     {
         "sysprop": "lucee.library.tld",
         "envvar": "LUCEE_LIBRARY_TLD",

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.279-SNAPSHOT"/>
+  <property name="version" value="6.2.0.280-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.279-SNAPSHOT</version>
+  <version>6.2.0.280-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>