AE86 9 mēneši atpakaļ
vecāks
revīzija
f2f1fbcb97

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MetricReporter.java

@@ -95,7 +95,7 @@ public class MetricReporter implements ScheduledTaskJob {
 
 
     private AppReportMetric report = new AppReportMetric();
     private AppReportMetric report = new AppReportMetric();
 
 
-    private final int SHOW_BUFFER_ACTUATOR_SIZE = 6;
+    private final int SHOW_BUFFER_ACTUATOR_SIZE = 7;
 
 
     @PostConstruct
     @PostConstruct
     private void init() {
     private void init() {

+ 6 - 2
dbsyncer-web/src/main/assembly/bin/startup-docker.sh

@@ -22,7 +22,7 @@ fi
 #JAVA_HOME=/opt/jdk1.8.0_121
 #JAVA_HOME=/opt/jdk1.8.0_121
 PATH=$JAVA_HOME/bin
 PATH=$JAVA_HOME/bin
 # #CLASSPATH=.;$JAVA_HOME/lib;$JAVA_HOME/lib/dt.jar;$JAVA_HOME/lib/tools.jar
 # #CLASSPATH=.;$JAVA_HOME/lib;$JAVA_HOME/lib/dt.jar;$JAVA_HOME/lib/tools.jar
-SERVER_OPTS='-Xms2048m -Xmx2048m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m'
+SERVER_OPTS='-Xms3800m -Xmx3800m -Xmn1500m -Xss512k -XX:MetaspaceSize=192m'
 # set debug model
 # set debug model
 #SERVER_OPTS="$SERVER_OPTS -Djava.compiler=NONE -Xnoagent -Xdebug -Xrunjdwp:transport=dt_socket,address=15005,server=y,suspend=n"
 #SERVER_OPTS="$SERVER_OPTS -Djava.compiler=NONE -Xnoagent -Xdebug -Xrunjdwp:transport=dt_socket,address=15005,server=y,suspend=n"
 # set jmxremote args
 # set jmxremote args
@@ -53,7 +53,11 @@ fi
 SERVER_OPTS="$SERVER_OPTS \
 SERVER_OPTS="$SERVER_OPTS \
 -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:$DBS_HOME/lib \
 -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:$DBS_HOME/lib \
 -Dspring.config.location=$CONFIG_PATH \
 -Dspring.config.location=$CONFIG_PATH \
--Dfile.encoding=UTF-8 -Duser.dir=$DBS_HOME"
+-Dfile.encoding=UTF-8 -Duser.dir=$DBS_HOME \
+-XX:+UseStringCache -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 \
+-XX:+CMSClassUnloadingEnabled -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly \
+-XX:CMSInitiatingOccupancyFraction=68 -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps \
+-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$DBS_HOME/logs -XX:ErrorFile=$DBS_HOME/logs/hs_err_pid_%p.log"
 
 
 # execute command
 # execute command
 echo $SERVER_OPTS
 echo $SERVER_OPTS

+ 4 - 1
dbsyncer-web/src/main/assembly/bin/startup.bat

@@ -9,7 +9,7 @@ for %%F in ("%~dp0\..\") do set "DBS_HOME=%%~dpF"
 echo DBS_HOME=%DBS_HOME%
 echo DBS_HOME=%DBS_HOME%
 cd ../
 cd ../
 
 
-set SERVER_OPTS=-Xms2048m -Xmx2048m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m
+set SERVER_OPTS=-Xms3800m -Xmx3800m -Xmn1500m -Xss512k -XX:MetaspaceSize=192m
 rem debug model
 rem debug model
 rem set SERVER_OPTS=%SERVER_OPTS% -Djava.compiler=NONE -Xnoagent -Xdebug -Xrunjdwp:transport=dt_socket,address=15005,server=y,suspend=n
 rem set SERVER_OPTS=%SERVER_OPTS% -Djava.compiler=NONE -Xnoagent -Xdebug -Xrunjdwp:transport=dt_socket,address=15005,server=y,suspend=n
 rem set IPv4
 rem set IPv4
@@ -33,6 +33,9 @@ set SERVER_OPTS=%SERVER_OPTS% -agentpath:%ENCRYPT_FILE%
 set SERVER_OPTS=%SERVER_OPTS% -Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%DBS_HOME%lib"
 set SERVER_OPTS=%SERVER_OPTS% -Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%DBS_HOME%lib"
 set SERVER_OPTS=%SERVER_OPTS% -Dspring.config.location=%DBS_HOME%conf\application.properties
 set SERVER_OPTS=%SERVER_OPTS% -Dspring.config.location=%DBS_HOME%conf\application.properties
 set SERVER_OPTS=%SERVER_OPTS% -Dfile.encoding=UTF-8 -Duser.dir=%DBS_HOME%
 set SERVER_OPTS=%SERVER_OPTS% -Dfile.encoding=UTF-8 -Duser.dir=%DBS_HOME%
+set SERVER_OPTS=%SERVER_OPTS% -XX:+UseStringCache -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+CMSClassUnloadingEnabled -XX:+DisableExplicitGC
+set SERVER_OPTS=%SERVER_OPTS% -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=68 -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps
+set SERVER_OPTS=%SERVER_OPTS% -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=%DBS_HOME%logs -XX:ErrorFile=%DBS_HOME%logs\hs_err.log
 
 
 echo %SERVER_OPTS%
 echo %SERVER_OPTS%
 java %SERVER_OPTS% org.dbsyncer.web.Application
 java %SERVER_OPTS% org.dbsyncer.web.Application

+ 1 - 1
dbsyncer-web/src/main/assembly/bin/startup.sh

@@ -57,7 +57,7 @@ SERVER_OPTS="$SERVER_OPTS \
 -XX:+UseStringCache -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 \
 -XX:+UseStringCache -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 \
 -XX:+CMSClassUnloadingEnabled -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly \
 -XX:+CMSClassUnloadingEnabled -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly \
 -XX:CMSInitiatingOccupancyFraction=68 -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps \
 -XX:CMSInitiatingOccupancyFraction=68 -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps \
--XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$DBS_HOME/logs -XX:ErrorFile=$DBS_HOME/logs/hs_err_pid%p.log"
+-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$DBS_HOME/logs -XX:ErrorFile=$DBS_HOME/logs/hs_err_pid_%p.log"
 
 
 # execute command
 # execute command
 echo $SERVER_OPTS
 echo $SERVER_OPTS