You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dg...@apache.org on 2023/01/27 08:06:48 UTC
[unomi] branch master updated: UNOMI-729 : Use default RAM settings (#569)
This is an automated email from the ASF dual-hosted git repository.
dgriffon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new e5a2b133b UNOMI-729 : Use default RAM settings (#569)
e5a2b133b is described below
commit e5a2b133b22e08412c85a7c84e214d759abcb297
Author: David Griffon <dg...@jahia.com>
AuthorDate: Fri Jan 27 09:06:41 2023 +0100
UNOMI-729 : Use default RAM settings (#569)
* UNOMI-729 : Use default RAM settings
* UNOMI-729 : Update documentation
---
manual/src/main/asciidoc/building-and-deploying.adoc | 7 +++----
package/src/main/resources/bin/setenv | 4 +---
package/src/main/resources/bin/setenv.bat | 4 ++--
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/manual/src/main/asciidoc/building-and-deploying.adoc b/manual/src/main/asciidoc/building-and-deploying.adoc
index 7896d563d..840639e6e 100644
--- a/manual/src/main/asciidoc/building-and-deploying.adoc
+++ b/manual/src/main/asciidoc/building-and-deploying.adoc
@@ -133,16 +133,15 @@ environment if you intend to re-deploy the context server KAR iteratively.
Additional requirements:
* Apache Karaf 4.2.x, http://karaf.apache.org[http://karaf.apache.org]
-Before deploying, make sure that you have Apache Karaf properly installed. You will also have to increase the
-default maximum memory size and perm gen size by adjusting the following environment values in the bin/setenv(.bat)
+Before deploying, make sure that you have Apache Karaf properly installed. Depending of your usage, you may also have to increase the
+ memory size by adjusting the following environment values in the bin/setenv(.bat)
files (at the end of the file):
[source]
----
MY_DIRNAME=`dirname $0`
MY_KARAF_HOME=`cd "$MY_DIRNAME/.."; pwd`
- export JAVA_MAX_MEM=3G
- export JAVA_MAX_PERM_MEM=384M
+ export KARAF_OPTS="$KARAF_OPTS -Xmx3G"
----
Install the WAR support, CXF and Karaf Cellar into Karaf by doing the following in the Karaf command line:
diff --git a/package/src/main/resources/bin/setenv b/package/src/main/resources/bin/setenv
index 8c5ba86ac..e48561de4 100755
--- a/package/src/main/resources/bin/setenv
+++ b/package/src/main/resources/bin/setenv
@@ -57,6 +57,4 @@ MY_KARAF_HOME=`cd "$MY_DIRNAME/.."; pwd`
# On Linux:
# export YOURKIT_AGENTPATH="/home/jahia/install/yourkit/YourKit-JavaProfiler-2017.02/bin/linux-x86-64/libyjpagent.so"
# Also activate this line to activate the agent on the JVM command line:
-# export KARAF_OPTS="-agentpath:$YOURKIT_AGENTPATH=disablestacktelemetry,exceptions=disable,delay=10000,probe_disable=*"
-
-export JAVA_MAX_MEM=2G
\ No newline at end of file
+# export KARAF_OPTS="-agentpath:$YOURKIT_AGENTPATH=disablestacktelemetry,exceptions=disable,delay=10000,probe_disable=*"
\ No newline at end of file
diff --git a/package/src/main/resources/bin/setenv.bat b/package/src/main/resources/bin/setenv.bat
index c73cd8b80..f5db6f80b 100644
--- a/package/src/main/resources/bin/setenv.bat
+++ b/package/src/main/resources/bin/setenv.bat
@@ -43,11 +43,11 @@ rem SET JAVA_HOME
rem Minimum memory for the JVM
rem SET JAVA_MIN_MEM
rem Maximum memory for the JVM
-SET JAVA_MAX_MEM=2G
+REM SET JAVA_MAX_MEM
rem Minimum perm memory for the JVM
rem SET JAVA_PERM_MEM
rem Maximum perm memory for the JVM
-SET JAVA_MAX_PERM_MEM=512M
+rem SET JAVA_MAX_PERM_MEM
rem Karaf home folder
rem SET KARAF_HOME
rem Karaf data folder