From 24014420c89de046d58c7bcb31f193113fb1b05f Mon Sep 17 00:00:00 2001
From: Makhtar DIAGNE <mamakh@users.noreply.github.com>
Date: Tue, 10 Nov 2020 09:06:43 +0000
Subject: [PATCH] =?UTF-8?q?Limitation=20de=20la=20m=C3=A9moire=20utilis?=
=?UTF-8?q?=C3=A9e=20par=20les=20services=20SpringBoot=20sur=20la=20machin?=
=?UTF-8?q?e=20de=20dev=20(#52)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* [TECH] Limit max memory for services launched by Springboot plugin
* [TECH] PR review
Co-authored-by: Emmanuel Deviller <emmanuel.deviller@xelians.fr>
Co-authored-by: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>
---
api/api-iam/iam-external/pom.xml | 1 +
api/api-iam/iam-internal/pom.xml | 3 +--
api/api-referential/referential-external/pom.xml | 1 +
api/api-referential/referential-internal/pom.xml | 2 +-
api/api-security/security-internal/pom.xml | 1 +
pom.xml | 3 ++-
tools/start_vitamui.sh | 8 ++++++--
ui/ui-identity/pom.xml | 1 +
ui/ui-portal/pom.xml | 1 +
ui/ui-referential/pom.xml | 3 ++-
10 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/api/api-iam/iam-external/pom.xml b/api/api-iam/iam-external/pom.xml
index 828881d9..56994ad2 100644
--- a/api/api-iam/iam-external/pom.xml
+++ b/api/api-iam/iam-external/pom.xml
@@ -208,6 +208,7 @@
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.iam.external.server.ApiIamServerApplication</mainClass>
+ <jvmArguments>-Xmx512m</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
diff --git a/api/api-iam/iam-internal/pom.xml b/api/api-iam/iam-internal/pom.xml
index caaf5792..2e0fcab2 100644
--- a/api/api-iam/iam-internal/pom.xml
+++ b/api/api-iam/iam-internal/pom.xml
@@ -281,8 +281,7 @@
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.iam.internal.server.ApiIamServerApplication</mainClass>
- <jvmArguments> -Dvitam.config.folder=${basedir}/src/main/config/dev-vitam
- </jvmArguments>
+ <jvmArguments>-Xmx512m -Dvitam.config.folder=${basedir}/src/main/config/dev-vitam</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
diff --git a/api/api-referential/referential-external/pom.xml b/api/api-referential/referential-external/pom.xml
index 32eed31c..9a664aea 100644
--- a/api/api-referential/referential-external/pom.xml
+++ b/api/api-referential/referential-external/pom.xml
@@ -210,6 +210,7 @@
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.referential.external.server.ApiReferentialServerApplication</mainClass>
+ <jvmArguments>-Xmx512m</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
diff --git a/api/api-referential/referential-internal/pom.xml b/api/api-referential/referential-internal/pom.xml
index 0b62294d..97475f50 100644
--- a/api/api-referential/referential-internal/pom.xml
+++ b/api/api-referential/referential-internal/pom.xml
@@ -285,7 +285,7 @@
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.referential.internal.server.ApiReferentialServerApplication</mainClass>
<jvmArguments>
- -Dvitam.config.folder=${basedir}/src/main/config/dev-vitam
+ -Xmx512m -Dvitam.config.folder=${basedir}/src/main/config/dev-vitam
</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
diff --git a/api/api-security/security-internal/pom.xml b/api/api-security/security-internal/pom.xml
index 64bf8545..a52d472f 100644
--- a/api/api-security/security-internal/pom.xml
+++ b/api/api-security/security-internal/pom.xml
@@ -155,6 +155,7 @@
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.security.server.ApiSecurityServerApplication</mainClass>
+ <jvmArguments>-Xmx512m</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
diff --git a/pom.xml b/pom.xml
index eef30fd6..db1e2f1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1154,7 +1154,7 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven.project.info.reports.plugin.version}</version>
</plugin>
-
+
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
@@ -1241,6 +1241,7 @@
<version>${spring.boot.version}</version>
<configuration>
<addResources>false</addResources>
+ <jvmArguments>-Xmx512m</jvmArguments>
</configuration>
</plugin>
<plugin>
diff --git a/tools/start_vitamui.sh b/tools/start_vitamui.sh
index 1eecbb55..80680527 100755
--- a/tools/start_vitamui.sh
+++ b/tools/start_vitamui.sh
@@ -50,7 +50,7 @@ function start_api() {
launch "../api/api-iam/iam-external" "$SPRINGBOOT"
# Start Cas Server
- launch "../cas/cas-server" "java -Dspring.config.additional-location=src/main/config/cas-server-application-dev.yml -jar target/cas-server.war"
+ launch "../cas/cas-server" "java -Xmx512m -Dspring.config.additional-location=src/main/config/cas-server-application-dev.yml -jar target/cas-server.war"
}
function start_ui_prod() {
@@ -107,15 +107,19 @@ echo
;;
"back")
start_api
+ sleep 15
start_ui_back_dev
- ;;
+ ;;
"front")
start_api
+ sleep 15
start_ui_back_dev
+ sleep 15
start_ui_front_dev
;;
*)
start_api
+ sleep 15
start_ui_prod
;;
esac
diff --git a/ui/ui-identity/pom.xml b/ui/ui-identity/pom.xml
index def11177..eb7baf0d 100644
--- a/ui/ui-identity/pom.xml
+++ b/ui/ui-identity/pom.xml
@@ -185,6 +185,7 @@
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.identity.IdentityApplication</mainClass>
+ <jvmArguments>-Xmx512m</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
diff --git a/ui/ui-portal/pom.xml b/ui/ui-portal/pom.xml
index 2f003623..81a52462 100644
--- a/ui/ui-portal/pom.xml
+++ b/ui/ui-portal/pom.xml
@@ -173,6 +173,7 @@
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.portal.PortalApplication</mainClass>
+ <jvmArguments>-Xmx512m</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
diff --git a/ui/ui-referential/pom.xml b/ui/ui-referential/pom.xml
index 31359c63..5d65a3ef 100644
--- a/ui/ui-referential/pom.xml
+++ b/ui/ui-referential/pom.xml
@@ -173,6 +173,7 @@
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.referential.ReferentialApplication</mainClass>
+ <jvmArguments>-Xmx512m</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
@@ -224,7 +225,7 @@
<arguments>run copy-scss:vitamui-library</arguments>
</configuration>
</execution>
-
+
<execution>
<id>npm run build</id>
<goals>
--
GitLab