Merge pull request #639 from nobodyiam/optimize-gc

Optimize gc
apolloconfig · Jun 13, 2017 · 9b6c51b · 9b6c51b
2 parents 32f5fc8 + 8a48afd
commit 9b6c51b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh
@@ -6,7 +6,7 @@ LOG_DIR=/opt/logs/100003172
 SERVER_PORT=8090
 
 ## Adjust memory settings if necessary
-#export JAVA_OPTS="-Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1024m -XX:MaxNewSize=1024m -XX:SurvivorRatio=22"
+#export JAVA_OPTS="-Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=8"
 
 ## Only uncomment the following when you are using server jvm
 #export JAVA_OPTS="$JAVA_OPTS -server -XX:-ReduceInitialCardMarks"

diff --git a/apollo-common/src/main/resources/application.properties b/apollo-common/src/main/resources/application.properties
@@ -13,6 +13,6 @@ spring.jpa.hibernate.globally_quoted_identifiers=true
 spring.jpa.properties.hibernate.globally_quoted_identifiers=true
 
 # Tomcat configuration
-server.tomcat.accept-count=1024
+server.tomcat.accept-count=5000
 # Increase tomcat header size for longer GET query parameter, should be n * 1024
 server.tomcat.maxHttpHeaderSize=10240
diff --git a/.../src/main/java/com/ctrip/framework/apollo/configservice/util/InstanceConfigAuditUtil.java b/.../src/main/java/com/ctrip/framework/apollo/configservice/util/InstanceConfigAuditUtil.java
@@ -33,9 +33,9 @@
  */
 @Service
 public class InstanceConfigAuditUtil implements InitializingBean {
-  private static final int INSTANCE_CONFIG_AUDIT_MAX_SIZE = 2000;
-  private static final int INSTANCE_CACHE_MAX_SIZE = 10000;
-  private static final int INSTANCE_CONFIG_CACHE_MAX_SIZE = 10000;
+  private static final int INSTANCE_CONFIG_AUDIT_MAX_SIZE = 10000;
+  private static final int INSTANCE_CACHE_MAX_SIZE = 50000;
+  private static final int INSTANCE_CONFIG_CACHE_MAX_SIZE = 50000;
   private static final long OFFER_TIME_LAST_MODIFIED_TIME_THRESHOLD_IN_MILLI = TimeUnit.MINUTES.toMillis(10);//10 minutes
   private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR);
   private final ExecutorService auditExecutorService;

diff --git a/apollo-configservice/src/main/scripts/startup.sh b/apollo-configservice/src/main/scripts/startup.sh
@@ -6,7 +6,7 @@ LOG_DIR=/opt/logs/100003171
 SERVER_PORT=8080
 
 ## Adjust memory settings if necessary
-#export JAVA_OPTS="-Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=18"
+#export JAVA_OPTS="-Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=8"
 
 ## Only uncomment the following when you are using server jvm
 #export JAVA_OPTS="$JAVA_OPTS -server -XX:-ReduceInitialCardMarks"

diff --git a/apollo-portal/src/main/scripts/startup.sh b/apollo-portal/src/main/scripts/startup.sh
@@ -6,7 +6,7 @@ LOG_DIR=/opt/logs/100003173
 SERVER_PORT=8080
 
 ## Adjust memory settings if necessary
-#export JAVA_OPTS="-Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22"
+#export JAVA_OPTS="-Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=8"
 
 ## Only uncomment the following when you are using server jvm
 #export JAVA_OPTS="$JAVA_OPTS -server -XX:-ReduceInitialCardMarks"