Ver código fonte

fix #2104 add g1gc options

Shinsuke Sugaya 6 anos atrás
pai
commit
4dc0898248

+ 49 - 13
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java

@@ -43,6 +43,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Djdk.io.permissionsUseCanonicalPath=true
     -Dhttp.maxConnections=20
     -server
+    -Xms512m
     -Xmx512m
     -XX:MaxMetaspaceSize=128m
     -XX:CompressedClassSpaceSize=32m
@@ -51,8 +52,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
+    -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
-    -XX:InitiatingHeapOccupancyPercent=75
+    -XX:InitiatingHeapOccupancyPercent=45
+    -XX:G1HeapRegionSize=1m
+    -XX:MaxGCPauseMillis=1000
+    -XX:G1NewSizePercent=5
+    -XX:G1MaxNewSizePercent=5
     -Djcifs.smb.client.responseTimeout=30000
     -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.connTimeout=60000
@@ -77,6 +83,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -server
+    -Xms256m
     -Xmx256m
     -XX:MaxMetaspaceSize=128m
     -XX:CompressedClassSpaceSize=32m
@@ -84,8 +91,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
+    -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
-    -XX:InitiatingHeapOccupancyPercent=75
+    -XX:InitiatingHeapOccupancyPercent=45
+    -XX:G1HeapRegionSize=1m
+    -XX:MaxGCPauseMillis=1000
+    -XX:G1NewSizePercent=5
+    -XX:G1MaxNewSizePercent=30
     -Dgroovy.use.classvalue=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noKeySetOptimization=true
@@ -101,6 +113,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -server
+    -Xms128m
     -Xmx128m
     -XX:MaxMetaspaceSize=128m
     -XX:CompressedClassSpaceSize=32m
@@ -109,8 +122,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
+    -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
-    -XX:InitiatingHeapOccupancyPercent=75
+    -XX:InitiatingHeapOccupancyPercent=45
+    -XX:G1HeapRegionSize=1m
+    -XX:MaxGCPauseMillis=1000
+    -XX:G1NewSizePercent=5
+    -XX:G1MaxNewSizePercent=5
     -Djcifs.smb.client.responseTimeout=30000
     -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.connTimeout=60000
@@ -375,7 +393,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     /** The key of the configuration. e.g. 10000 */
     String INDEXER_WEBFS_UPDATE_INTERVAL = "indexer.webfs.update.interval";
 
-    /** The key of the configuration. e.g. 20 */
+    /** The key of the configuration. e.g. 10 */
     String INDEXER_WEBFS_MAX_DOCUMENT_CACHE_SIZE = "indexer.webfs.max.document.cache.size";
 
     /** The key of the configuration. e.g. 10485760 */
@@ -1477,6 +1495,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Djdk.io.permissionsUseCanonicalPath=true
     -Dhttp.maxConnections=20
     -server
+    -Xms512m
     -Xmx512m
     -XX:MaxMetaspaceSize=128m
     -XX:CompressedClassSpaceSize=32m
@@ -1485,8 +1504,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
+    -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
-    -XX:InitiatingHeapOccupancyPercent=75
+    -XX:InitiatingHeapOccupancyPercent=45
+    -XX:G1HeapRegionSize=1m
+    -XX:MaxGCPauseMillis=1000
+    -XX:G1NewSizePercent=5
+    -XX:G1MaxNewSizePercent=5
     -Djcifs.smb.client.responseTimeout=30000
     -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.connTimeout=60000
@@ -1516,6 +1540,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -server
+    -Xms256m
     -Xmx256m
     -XX:MaxMetaspaceSize=128m
     -XX:CompressedClassSpaceSize=32m
@@ -1523,8 +1548,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
+    -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
-    -XX:InitiatingHeapOccupancyPercent=75
+    -XX:InitiatingHeapOccupancyPercent=45
+    -XX:G1HeapRegionSize=1m
+    -XX:MaxGCPauseMillis=1000
+    -XX:G1NewSizePercent=5
+    -XX:G1MaxNewSizePercent=30
     -Dgroovy.use.classvalue=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noKeySetOptimization=true
@@ -1544,6 +1574,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -server
+    -Xms128m
     -Xmx128m
     -XX:MaxMetaspaceSize=128m
     -XX:CompressedClassSpaceSize=32m
@@ -1552,8 +1583,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
+    -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
-    -XX:InitiatingHeapOccupancyPercent=75
+    -XX:InitiatingHeapOccupancyPercent=45
+    -XX:G1HeapRegionSize=1m
+    -XX:MaxGCPauseMillis=1000
+    -XX:G1NewSizePercent=5
+    -XX:G1MaxNewSizePercent=5
     -Djcifs.smb.client.responseTimeout=30000
     -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.connTimeout=60000
@@ -2523,14 +2559,14 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
 
     /**
      * Get the value for the key 'indexer.webfs.max.document.cache.size'. <br>
-     * The value is, e.g. 20 <br>
+     * The value is, e.g. 10 <br>
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      */
     String getIndexerWebfsMaxDocumentCacheSize();
 
     /**
      * Get the value for the key 'indexer.webfs.max.document.cache.size' as {@link Integer}. <br>
-     * The value is, e.g. 20 <br>
+     * The value is, e.g. 10 <br>
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      * @throws NumberFormatException When the property is not integer.
      */
@@ -8304,13 +8340,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             defaultMap.put(FessConfig.APP_DIGEST_ALGORISM, "sha256");
             defaultMap
                     .put(FessConfig.JVM_CRAWLER_OPTIONS,
-                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dhttp.maxConnections=20\n-server\n-Xmx512m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=75\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
+                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dhttp.maxConnections=20\n-server\n-Xms512m\n-Xmx512m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=1000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=5\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
             defaultMap
                     .put(FessConfig.JVM_SUGGEST_OPTIONS,
-                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-server\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=75\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n");
+                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-server\n-Xms256m\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=1000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=30\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n");
             defaultMap
                     .put(FessConfig.JVM_THUMBNAIL_OPTIONS,
-                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-server\n-Xmx128m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=75\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
+                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-server\n-Xms128m\n-Xmx128m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=1000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=5\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
             defaultMap.put(FessConfig.JOB_SYSTEM_JOB_IDS, "default_crawler");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_WEB, "Web Crawler - {0}");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_FILE, "File Crawler - {0}");
@@ -8398,7 +8434,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             defaultMap.put(FessConfig.INDEXER_WEBFS_COMMIT_MARGIN_TIME, "5000");
             defaultMap.put(FessConfig.INDEXER_WEBFS_MAX_EMPTY_LIST_COUNT, "3600");
             defaultMap.put(FessConfig.INDEXER_WEBFS_UPDATE_INTERVAL, "10000");
-            defaultMap.put(FessConfig.INDEXER_WEBFS_MAX_DOCUMENT_CACHE_SIZE, "20");
+            defaultMap.put(FessConfig.INDEXER_WEBFS_MAX_DOCUMENT_CACHE_SIZE, "10");
             defaultMap.put(FessConfig.INDEXER_WEBFS_MAX_DOCUMENT_REQUEST_SIZE, "10485760");
             defaultMap.put(FessConfig.INDEXER_DATA_MAX_DOCUMENT_CACHE_SIZE, "5");
             defaultMap.put(FessConfig.INDEXER_DATA_MAX_DOCUMENT_REQUEST_SIZE, "10485760");

+ 22 - 4
src/main/resources/fess_config.properties

@@ -24,6 +24,7 @@ jvm.crawler.options=\
 -Djdk.io.permissionsUseCanonicalPath=true\n\
 -Dhttp.maxConnections=20\n\
 -server\n\
+-Xms512m\n\
 -Xmx512m\n\
 -XX:MaxMetaspaceSize=128m\n\
 -XX:CompressedClassSpaceSize=32m\n\
@@ -32,8 +33,13 @@ jvm.crawler.options=\
 -XX:+DisableExplicitGC\n\
 -XX:+HeapDumpOnOutOfMemoryError\n\
 -XX:-OmitStackTraceInFastThrow\n\
+-XX:+UnlockExperimentalVMOptions\n\
 -XX:+UseG1GC\n\
--XX:InitiatingHeapOccupancyPercent=75\n\
+-XX:InitiatingHeapOccupancyPercent=45\n\
+-XX:G1HeapRegionSize=1m\n\
+-XX:MaxGCPauseMillis=1000\n\
+-XX:G1NewSizePercent=5\n\
+-XX:G1MaxNewSizePercent=5\n\
 -Djcifs.smb.client.responseTimeout=30000\n\
 -Djcifs.smb.client.soTimeout=35000\n\
 -Djcifs.smb.client.connTimeout=60000\n\
@@ -58,6 +64,7 @@ jvm.suggest.options=\
 -Djna.nosys=true\n\
 -Djdk.io.permissionsUseCanonicalPath=true\n\
 -server\n\
+-Xms256m\n\
 -Xmx256m\n\
 -XX:MaxMetaspaceSize=128m\n\
 -XX:CompressedClassSpaceSize=32m\n\
@@ -65,8 +72,13 @@ jvm.suggest.options=\
 -XX:+UseTLAB\n\
 -XX:+DisableExplicitGC\n\
 -XX:+HeapDumpOnOutOfMemoryError\n\
+-XX:+UnlockExperimentalVMOptions\n\
 -XX:+UseG1GC\n\
--XX:InitiatingHeapOccupancyPercent=75\n\
+-XX:InitiatingHeapOccupancyPercent=45\n\
+-XX:G1HeapRegionSize=1m\n\
+-XX:MaxGCPauseMillis=1000\n\
+-XX:G1NewSizePercent=5\n\
+-XX:G1MaxNewSizePercent=30\n\
 -Dgroovy.use.classvalue=true\n\
 -Dio.netty.noUnsafe=true\n\
 -Dio.netty.noKeySetOptimization=true\n\
@@ -82,6 +94,7 @@ jvm.thumbnail.options=\
 -Djna.nosys=true\n\
 -Djdk.io.permissionsUseCanonicalPath=true\n\
 -server\n\
+-Xms128m\n\
 -Xmx128m\n\
 -XX:MaxMetaspaceSize=128m\n\
 -XX:CompressedClassSpaceSize=32m\n\
@@ -90,8 +103,13 @@ jvm.thumbnail.options=\
 -XX:+DisableExplicitGC\n\
 -XX:+HeapDumpOnOutOfMemoryError\n\
 -XX:-OmitStackTraceInFastThrow\n\
+-XX:+UnlockExperimentalVMOptions\n\
 -XX:+UseG1GC\n\
--XX:InitiatingHeapOccupancyPercent=75\n\
+-XX:InitiatingHeapOccupancyPercent=45\n\
+-XX:G1HeapRegionSize=1m\n\
+-XX:MaxGCPauseMillis=1000\n\
+-XX:G1NewSizePercent=5\n\
+-XX:G1MaxNewSizePercent=5\n\
 -Djcifs.smb.client.responseTimeout=30000\n\
 -Djcifs.smb.client.soTimeout=35000\n\
 -Djcifs.smb.client.connTimeout=60000\n\
@@ -216,7 +234,7 @@ indexer.favorite.count.enabled=true
 indexer.webfs.commit.margin.time=5000
 indexer.webfs.max.empty.list.count=3600
 indexer.webfs.update.interval=10000
-indexer.webfs.max.document.cache.size=20
+indexer.webfs.max.document.cache.size=10
 indexer.webfs.max.document.request.size=10485760
 indexer.data.max.document.cache.size=5
 indexer.data.max.document.request.size=10485760