Skip to content

The Unified and Autonomous Development Platform

configure java memory to be a ratio of physical memory

Robin Shen027e8b0a5131
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
index c16429a99a..fc1324df27 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
@@ -9,7 +9,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.progress.ProgressBar;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.progress.ProgressBar.Type;
-import io.onedev.commons.utils.FileUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.page.admin.AdministrationPage;
@@ -35,7 +34,7 @@ public class ServerInformationPage extends AdministrationPage {
@Override
protected String load() {
- return FileUtils.byteCountToDisplaySize(Runtime.getRuntime().maxMemory());
+ return String.valueOf(Runtime.getRuntime().maxMemory() / 1024 / 1024) + " MB";
}
}));
@@ -43,8 +42,7 @@ public class ServerInformationPage extends AdministrationPage {
@Override
protected String load() {
- return FileUtils.byteCountToDisplaySize(
- Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory());
+ return String.valueOf((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1024 / 1024) + " MB";
}
}));
diff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.conf
index 9991b80c99..c0895f745a 100644
--- a/server-product/jsw/wrapper.conf
+++ b/server-product/jsw/wrapper.conf
@@ -79,12 +79,9 @@ wrapper.java.additional.14=--add-opens=java.base/java.util=ALL-UNNAMED
wrapper.java.additional.15=--add-opens=java.base/java.text=ALL-UNNAMED
wrapper.java.additional.16=--add-opens=java.desktop/java.awt.font=ALL-UNNAMED
-
-# Initial Java Heap Size (in MB)
-#wrapper.java.initmemory=512
-
# Maximum Java Heap Size (in MB)
-#wrapper.java.maxmemory=2048
+#wrapper.java.maxmemory=4096
+wrapper.java.maxmemory.percent=60
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=io.onedev.commons.launcher.bootstrap.Bootstrap