kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase the default memory size to avoid OOM (#11095)

This commit is contained in:
Rahul Bajaj 2023-07-15 07:56:31 -04:00 committed by GitHub
parent afe88e8a94
commit 2b37aa4d66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist-material/bin/oapService.sh
View File

@ -20,7 +20,7 @@ PRGDIR=$(dirname "$PRG")
[ -z "$OAP_HOME" ] && OAP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd) [ -z "$OAP_HOME" ] && OAP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd)
OAP_LOG_DIR="${OAP_LOG_DIR:-${OAP_HOME}/logs}" OAP_LOG_DIR="${OAP_LOG_DIR:-${OAP_HOME}/logs}"
JAVA_OPTS="${JAVA_OPTS:- -Xms256M -Xmx512M}" JAVA_OPTS="${JAVA_OPTS:- -Xms256M -Xmx4096M}"
if [ ! -d "${OAP_LOG_DIR}" ]; then if [ ! -d "${OAP_LOG_DIR}" ]; then
mkdir -p "${OAP_LOG_DIR}" mkdir -p "${OAP_LOG_DIR}"

2
dist-material/bin/oapServiceInit.sh
View File

@ -20,7 +20,7 @@ PRGDIR=$(dirname "$PRG")
[ -z "$OAP_HOME" ] && OAP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd) [ -z "$OAP_HOME" ] && OAP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd)
OAP_LOG_DIR="${OAP_HOME}/logs" OAP_LOG_DIR="${OAP_HOME}/logs"
JAVA_OPTS="${JAVA_OPTS:- -Xms256M -Xmx512M}" JAVA_OPTS="${JAVA_OPTS:- -Xms256M -Xmx4096M}"
if [ ! -d "${OAP_HOME}/logs" ]; then if [ ! -d "${OAP_HOME}/logs" ]; then
mkdir -p "${OAP_LOG_DIR}" mkdir -p "${OAP_LOG_DIR}"

2
dist-material/bin/oapServiceNoInit.sh
View File

@ -20,7 +20,7 @@ PRGDIR=$(dirname "$PRG")
[ -z "$OAP_HOME" ] && OAP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd) [ -z "$OAP_HOME" ] && OAP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd)
OAP_LOG_DIR=${OAP_LOG_DIR:-"${OAP_HOME}/logs"} OAP_LOG_DIR=${OAP_LOG_DIR:-"${OAP_HOME}/logs"}
JAVA_OPTS="${JAVA_OPTS:- -Xms256M -Xmx512M}" JAVA_OPTS="${JAVA_OPTS:- -Xms256M -Xmx4096M}"
if [ ! -d "${OAP_HOME}/logs" ]; then if [ ! -d "${OAP_HOME}/logs" ]; then
mkdir -p "${OAP_LOG_DIR}" mkdir -p "${OAP_LOG_DIR}"

2
dist-material/bin/webappService.sh
View File

@ -20,7 +20,7 @@ PRGDIR=$(dirname "$PRG")
[ -z "$WEBAPP_HOME" ] && WEBAPP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd) [ -z "$WEBAPP_HOME" ] && WEBAPP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd)
WEBAPP_LOG_DIR="${WEBAPP_LOG_DIR:-${WEBAPP_HOME}/logs}" WEBAPP_LOG_DIR="${WEBAPP_LOG_DIR:-${WEBAPP_HOME}/logs}"
JAVA_OPTS="${JAVA_OPTS:- -Xms256M -Xmx512M} -Dwebapp.logDir=${WEBAPP_LOG_DIR}" JAVA_OPTS="${JAVA_OPTS:- -Xms256M -Xmx1024M} -Dwebapp.logDir=${WEBAPP_LOG_DIR}"
JAR_PATH="${WEBAPP_HOME}/webapp" JAR_PATH="${WEBAPP_HOME}/webapp"
if [ ! -d "${WEBAPP_LOG_DIR}" ]; then if [ ! -d "${WEBAPP_LOG_DIR}" ]; then

1
docs/en/changes/changes.md
View File

@ -44,6 +44,7 @@
but in #10616, an empty array is returned. but in #10616, an empty array is returned.
* Cache all service entity in memory for query. * Cache all service entity in memory for query.
* Bump up jackson version to 2.15.2. * Bump up jackson version to 2.15.2.
* Increase the default memory size to avoid OOM.
#### UI #### UI