Skip to content

The Unified and Autonomous Development Platform

fix: Memory exhausted when bot clawled many files via web UI

Robin Shenee365c7bcb84
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
index 1ecbda0b33..1d6bb953e1 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
@@ -1028,6 +1028,10 @@ public class Upgrade extends AbstractPlugin {
"jakarta.persistence.validation.mode");
hibernateProps = Strings.CS.replace(hibernateProps, "GitPlex", "OneDev");
hibernateProps = Strings.CS.replace(hibernateProps, "TurboDev", "OneDev");
+ // Query plan caching is disabled in code, so these settings are obsolete.
+ hibernateProps = hibernateProps.replaceAll(
+ "(?m)^[ \\t]*hibernate\\.query\\.(?:plan_cache_enabled|plan_cache_max_size|plan_parameter_metadata_max_size)"
+ + "(?:[ \\t:=][^\\r\\n]*)?(?:\\r\\n|[\\r\\n]|$)", "");
if (!hibernateProps.contains("hsqldb.lob_file_scale")) {
hibernateProps = Strings.CS.replace(hibernateProps, "internaldb/onedev;",
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryService.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryService.java
index d4293382d9..6af072f6b7 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryService.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryService.java
@@ -1,6 +1,8 @@
package io.onedev.server.persistence;
import static org.hibernate.cfg.AvailableSettings.DIALECT;
+import static org.hibernate.cfg.AvailableSettings.QUERY_PLAN_CACHE_ENABLED;
+import static org.hibernate.cfg.AvailableSettings.QUERY_PLAN_CACHE_MAX_SIZE;
import static org.hibernate.cfg.AvailableSettings.STATIC_METAMODEL_POPULATION;
import java.util.Properties;
@@ -48,6 +50,10 @@ public class DefaultSessionFactoryService implements SessionFactoryService {
HazelcastInstance hazelcastInstance = clusterService.getHazelcastInstance();
Properties hibernateSettings = new Properties();
hibernateSettings.putAll(hibernateConfig);
+ // Cached Criteria plans can retain entities and their large object graphs.
+ // Override legacy cache sizes to avoid conflicting with the disabled cache.
+ hibernateSettings.put(QUERY_PLAN_CACHE_ENABLED, "false");
+ hibernateSettings.put(QUERY_PLAN_CACHE_MAX_SIZE, "0");
// We use the runtime JPA metamodel, but do not generate static metamodel classes.
hibernateSettings.putIfAbsent(STATIC_METAMODEL_POPULATION, "disabled");
// Keep the configured dialect for OneDev's upgrade/maintenance decisions,
diff --git a/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java b/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java
index 4d1a9c3065..d4e9c41589 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java
@@ -34,8 +34,7 @@ public class HibernateConfig extends Properties {
DIALECT, JAKARTA_JDBC_DRIVER, JAKARTA_JDBC_URL, JAKARTA_JDBC_USER, JAKARTA_JDBC_PASSWORD, "hibernate.hikari.leakDetectionThreshold",
"hibernate.hikari.maxLifetime", "hibernate.hikari.connectionTimeout",
"hibernate.hikari.maximumPoolSize", "hibernate.hikari.validationTimeout",
- "hibernate.show_sql", "hibernate.query.plan_cache_max_size",
- "hibernate.query.plan_parameter_metadata_max_size"
+ "hibernate.show_sql"
};
public HibernateConfig(File installDir) {
diff --git a/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentService.java b/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentService.java
index c6b701b185..c5acf40d2e 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentService.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentService.java
@@ -28,7 +28,7 @@ public abstract class AbstractEnvironmentService {
private static final long DEFAULT_LOG_FILE_SIZE = 8192;
- private static final int MEMORY_USAGE_PERCENT = 25;
+ private static final int MEMORY_USAGE_PERCENT = 20;
private final Map<String, Environment> envs = new ConcurrentHashMap<>();
diff --git a/server-product/helm/templates/_pod.tpl b/server-product/helm/templates/_pod.tpl
index 2389b5d598..8dfa1b7014 100644
--- a/server-product/helm/templates/_pod.tpl
+++ b/server-product/helm/templates/_pod.tpl
@@ -48,14 +48,6 @@ containers:
- name: thread_stack_size
value: "{{ .Values.onedev.jvm.threadStackSize }}"
{{- end }}
-{{- if .Values.onedev.hibernate.queryPlanCacheMaxSize }}
- - name: hibernate_query_plan_cache_max_size
- value: "{{ .Values.onedev.hibernate.queryPlanCacheMaxSize }}"
-{{- end }}
-{{- if .Values.onedev.hibernate.queryPlanParameterMetadataMaxSize }}
- - name: hibernate_query_plan_parameter_metadata_max_size
- value: "{{ .Values.onedev.hibernate.queryPlanParameterMetadataMaxSize }}"
-{{- end }}
{{- if .Values.onedev.initSettings.user }}
- name: initial_user
value: {{ .Values.onedev.initSettings.user }}
diff --git a/server-product/helm/values.yaml b/server-product/helm/values.yaml
index 24ed95ea3a..e50e7211bf 100644
--- a/server-product/helm/values.yaml
+++ b/server-product/helm/values.yaml
@@ -46,9 +46,6 @@ onedev:
jvm:
maxMemoryPercent: "50"
threadStackSize: "1024k"
- hibernate:
- queryPlanCacheMaxSize: "2048"
- queryPlanParameterMetadataMaxSize: "128"
# Specify OneDev Server initial settings to avoid manual setup
initSettings:
# onedev.initSettings.user -- Administrator username. Leave empty to prompt
diff --git a/server-product/system/conf/hibernate.properties b/server-product/system/conf/hibernate.properties
index 35c0c354eb..079fe86681 100644
--- a/server-product/system/conf/hibernate.properties
+++ b/server-product/system/conf/hibernate.properties
@@ -75,5 +75,3 @@ hibernate.validator.apply_to_ddl=false
hibernate.cache.region.factory_class=io.onedev.server.persistence.HazelcastLocalCacheRegionFactory
hibernate.cache.use_query_cache=true
hibernate.cache.auto_evict_collection_cache=true
-hibernate.query.plan_cache_max_size=2048
-hibernate.query.plan_parameter_metadata_max_size=128