From 4d70d58633e61d2d909d6e7dd8056b2aeb3d5f57 Mon Sep 17 00:00:00 2001 From: Michael Hashimoto Date: Mon, 10 Jun 2024 16:39:03 -0700 Subject: [PATCH 1/4] LRCI-4269 Set higher memory settings for gradle execution when configured --- build-common.xml | 7 +++++++ build.properties | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/build-common.xml b/build-common.xml index 574d9c93ac7ac9..4653fd0f4a6f1e 100644 --- a/build-common.xml +++ b/build-common.xml @@ -1971,6 +1971,13 @@ rerun your task. + + + + + + + diff --git a/build.properties b/build.properties index c269f16b26a62d..c0cead25bbbaba 100644 --- a/build.properties +++ b/build.properties @@ -432,6 +432,9 @@ gradle.releng.pom.scm.developerConnection=scm:git:git@github.com:liferay/liferay-portal.git gradle.releng.pom.scm.url=https://github.com/liferay/liferay-portal + gradle.server.memory=12gb + #gradle.server.memory=24gb + gradle.stop.daemon.enabled=true #gradle.update.file.versions.excludes=**/gradle-plugins-target-platform/,**/gradle-plugins-workspace/ @@ -441,6 +444,7 @@ org.gradle.daemon=true org.gradle.internal.launcher.welcomeMessageEnabled=false org.gradle.jvmargs=-Xms8g -Xmx8g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 + org.gradle.jvmargs[24gb]=-Xms16g -Xmx16g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 org.gradle.logging.level=lifecycle org.gradle.warning.mode=none From 16c353a2a8a8aa454b8c265b960f876573510031 Mon Sep 17 00:00:00 2001 From: Michael Hashimoto Date: Tue, 11 Jun 2024 10:06:13 -0700 Subject: [PATCH 2/4] LRCI-4269 Increaes NewSize & MaxNewSize --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index c0cead25bbbaba..ea0eb3f49c967f 100644 --- a/build.properties +++ b/build.properties @@ -444,7 +444,7 @@ org.gradle.daemon=true org.gradle.internal.launcher.welcomeMessageEnabled=false org.gradle.jvmargs=-Xms8g -Xmx8g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 - org.gradle.jvmargs[24gb]=-Xms16g -Xmx16g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 + org.gradle.jvmargs[24gb]=-Xms16g -Xmx16g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=4g -XX:MetaspaceSize=512m -XX:NewSize=4g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 org.gradle.logging.level=lifecycle org.gradle.warning.mode=none From 976eded3c7cc780352450debe642a78c59ef3923 Mon Sep 17 00:00:00 2001 From: Peter Yoo Date: Tue, 11 Jun 2024 14:11:10 -0700 Subject: [PATCH 3/4] Revert "LRCI-4269 Increaes NewSize & MaxNewSize" This reverts commit 16c353a2a8a8aa454b8c265b960f876573510031. --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index ea0eb3f49c967f..c0cead25bbbaba 100644 --- a/build.properties +++ b/build.properties @@ -444,7 +444,7 @@ org.gradle.daemon=true org.gradle.internal.launcher.welcomeMessageEnabled=false org.gradle.jvmargs=-Xms8g -Xmx8g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 - org.gradle.jvmargs[24gb]=-Xms16g -Xmx16g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=4g -XX:MetaspaceSize=512m -XX:NewSize=4g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 + org.gradle.jvmargs[24gb]=-Xms16g -Xmx16g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 org.gradle.logging.level=lifecycle org.gradle.warning.mode=none From cf4e7350e3791a746fcb87d6a4e569b2d2756ed9 Mon Sep 17 00:00:00 2001 From: Peter Yoo Date: Tue, 11 Jun 2024 14:11:28 -0700 Subject: [PATCH 4/4] Revert "LRCI-4269 Set higher memory settings for gradle execution when configured" This reverts commit 4d70d58633e61d2d909d6e7dd8056b2aeb3d5f57. --- build-common.xml | 7 ------- build.properties | 4 ---- 2 files changed, 11 deletions(-) diff --git a/build-common.xml b/build-common.xml index 4653fd0f4a6f1e..574d9c93ac7ac9 100644 --- a/build-common.xml +++ b/build-common.xml @@ -1971,13 +1971,6 @@ rerun your task. - - - - - - - diff --git a/build.properties b/build.properties index c0cead25bbbaba..c269f16b26a62d 100644 --- a/build.properties +++ b/build.properties @@ -432,9 +432,6 @@ gradle.releng.pom.scm.developerConnection=scm:git:git@github.com:liferay/liferay-portal.git gradle.releng.pom.scm.url=https://github.com/liferay/liferay-portal - gradle.server.memory=12gb - #gradle.server.memory=24gb - gradle.stop.daemon.enabled=true #gradle.update.file.versions.excludes=**/gradle-plugins-target-platform/,**/gradle-plugins-workspace/ @@ -444,7 +441,6 @@ org.gradle.daemon=true org.gradle.internal.launcher.welcomeMessageEnabled=false org.gradle.jvmargs=-Xms8g -Xmx8g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 - org.gradle.jvmargs[24gb]=-Xms16g -Xmx16g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 org.gradle.logging.level=lifecycle org.gradle.warning.mode=none