[incubator-skywalking] branch master updated: Improves stability. (#2241)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 73f49ce  Improves stability. (#2241)
73f49ce is described below

commit 73f49ceb9eb37a236b34e0fd4b31f4e0fc6f4ec2
Author: Jared Tan <ji...@daocloud.io>
AuthorDate: Wed Feb 13 09:52:39 2019 +0800

    Improves stability. (#2241)
---
 docker/oap/docker-entrypoint.sh | 4 ++--
 docker/ui/docker-entrypoint.sh  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh
index 0c194b0..593ad1c 100755
--- a/docker/oap/docker-entrypoint.sh
+++ b/docker/oap/docker-entrypoint.sh
@@ -24,5 +24,5 @@ do
     CLASSPATH="$i:$CLASSPATH"
 done
 
-exec java ${JAVA_OPTS} -classpath $CLASSPATH \
- org.apache.skywalking.oap.server.starter.OAPServerStartUp "$@"
+exec java  -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
+     ${JAVA_OPTS} -classpath $CLASSPATH org.apache.skywalking.oap.server.starter.OAPServerStartUp "$@"
diff --git a/docker/ui/docker-entrypoint.sh b/docker/ui/docker-entrypoint.sh
index a94d0ec..ef30a59 100755
--- a/docker/ui/docker-entrypoint.sh
+++ b/docker/ui/docker-entrypoint.sh
@@ -18,4 +18,5 @@
 
 set -ex
 
-exec java -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@"
+exec java -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \ 
+    -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@"