Browse Source

fix #2272 disable HeapDumpOnOutOfMemoryError

Shinsuke Sugaya 5 years ago
parent
commit
d8015582df

+ 1 - 1
src/main/assemblies/files/fess.in.bat

@@ -81,7 +81,7 @@ if NOT "%FESS_USE_GC_LOGGING%" == "" set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCAppli
 if NOT "%FESS_USE_GC_LOGGING%" == "" set JAVA_OPTS=%JAVA_OPTS% -Xloggc:%FESS_HOME%/logs/gc.log
 if NOT "%FESS_USE_GC_LOGGING%" == "" set JAVA_OPTS=%JAVA_OPTS% -Xloggc:%FESS_HOME%/logs/gc.log
 
 
 REM Causes the JVM to dump its heap on OutOfMemory.
 REM Causes the JVM to dump its heap on OutOfMemory.
-set JAVA_OPTS=%JAVA_OPTS% -XX:+HeapDumpOnOutOfMemoryError
+REM set JAVA_OPTS=%JAVA_OPTS% -XX:+HeapDumpOnOutOfMemoryError
 REM The path to the heap dump location, note directory must exists and have enough
 REM The path to the heap dump location, note directory must exists and have enough
 REM space for a full heap dump.
 REM space for a full heap dump.
 REM JAVA_OPTS=%JAVA_OPTS% -XX:HeapDumpPath=%FESS_HOME%/logs/heapdump.hprof
 REM JAVA_OPTS=%JAVA_OPTS% -XX:HeapDumpPath=%FESS_HOME%/logs/heapdump.hprof

+ 1 - 1
src/main/assemblies/files/fess.in.sh

@@ -71,7 +71,7 @@ if [ "x$FESS_USE_GC_LOGGING" != "x" ]; then
 fi
 fi
 
 
 # Causes the JVM to dump its heap on OutOfMemory.
 # Causes the JVM to dump its heap on OutOfMemory.
-JAVA_OPTS="$JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"
+#JAVA_OPTS="$JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"
 # The path to the heap dump location, note directory must exists and have enough
 # The path to the heap dump location, note directory must exists and have enough
 # space for a full heap dump.
 # space for a full heap dump.
 #JAVA_OPTS="$JAVA_OPTS -XX:HeapDumpPath=$FESS_HOME/logs/heapdump.hprof"
 #JAVA_OPTS="$JAVA_OPTS -XX:HeapDumpPath=$FESS_HOME/logs/heapdump.hprof"

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

@@ -50,7 +50,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:-UseGCOverheadLimit
     -XX:-UseGCOverheadLimit
     -XX:+UseTLAB
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
-    -XX:+HeapDumpOnOutOfMemoryError
+    -XX:-HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
     -XX:-OmitStackTraceInFastThrow
     -XX:+UnlockExperimentalVMOptions
     -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
     -XX:+UseG1GC
@@ -90,7 +90,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:-UseGCOverheadLimit
     -XX:-UseGCOverheadLimit
     -XX:+UseTLAB
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
-    -XX:+HeapDumpOnOutOfMemoryError
+    -XX:-HeapDumpOnOutOfMemoryError
     -XX:+UnlockExperimentalVMOptions
     -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
     -XX:+UseG1GC
     -XX:InitiatingHeapOccupancyPercent=45
     -XX:InitiatingHeapOccupancyPercent=45
@@ -120,7 +120,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:-UseGCOverheadLimit
     -XX:-UseGCOverheadLimit
     -XX:+UseTLAB
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
-    -XX:+HeapDumpOnOutOfMemoryError
+    -XX:-HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
     -XX:-OmitStackTraceInFastThrow
     -XX:+UnlockExperimentalVMOptions
     -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
     -XX:+UseG1GC
@@ -1541,7 +1541,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:-UseGCOverheadLimit
     -XX:-UseGCOverheadLimit
     -XX:+UseTLAB
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
-    -XX:+HeapDumpOnOutOfMemoryError
+    -XX:-HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
     -XX:-OmitStackTraceInFastThrow
     -XX:+UnlockExperimentalVMOptions
     -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
     -XX:+UseG1GC
@@ -1586,7 +1586,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:-UseGCOverheadLimit
     -XX:-UseGCOverheadLimit
     -XX:+UseTLAB
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
-    -XX:+HeapDumpOnOutOfMemoryError
+    -XX:-HeapDumpOnOutOfMemoryError
     -XX:+UnlockExperimentalVMOptions
     -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
     -XX:+UseG1GC
     -XX:InitiatingHeapOccupancyPercent=45
     -XX:InitiatingHeapOccupancyPercent=45
@@ -1620,7 +1620,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:-UseGCOverheadLimit
     -XX:-UseGCOverheadLimit
     -XX:+UseTLAB
     -XX:+UseTLAB
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
-    -XX:+HeapDumpOnOutOfMemoryError
+    -XX:-HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
     -XX:-OmitStackTraceInFastThrow
     -XX:+UnlockExperimentalVMOptions
     -XX:+UnlockExperimentalVMOptions
     -XX:+UseG1GC
     -XX:+UseG1GC
@@ -8600,13 +8600,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             defaultMap.put(FessConfig.APP_DIGEST_ALGORISM, "sha256");
             defaultMap.put(FessConfig.APP_DIGEST_ALGORISM, "sha256");
             defaultMap
             defaultMap
                     .put(FessConfig.JVM_CRAWLER_OPTIONS,
                     .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-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=60000\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");
+                            "-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=60000\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
             defaultMap
                     .put(FessConfig.JVM_SUGGEST_OPTIONS,
                     .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-Xms128m\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=60000\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");
+                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-server\n-Xms128m\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=60000\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
             defaultMap
                     .put(FessConfig.JVM_THUMBNAIL_OPTIONS,
                     .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-Xms128m\n-Xmx256m\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=4m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=50\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-Xmx256m\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=4m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=50\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_SYSTEM_JOB_IDS, "default_crawler");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_WEB, "Web Crawler - {0}");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_WEB, "Web Crawler - {0}");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_FILE, "File Crawler - {0}");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_FILE, "File Crawler - {0}");

+ 3 - 3
src/main/resources/fess_config.properties

@@ -31,7 +31,7 @@ jvm.crawler.options=\
 -XX:-UseGCOverheadLimit\n\
 -XX:-UseGCOverheadLimit\n\
 -XX:+UseTLAB\n\
 -XX:+UseTLAB\n\
 -XX:+DisableExplicitGC\n\
 -XX:+DisableExplicitGC\n\
--XX:+HeapDumpOnOutOfMemoryError\n\
+-XX:-HeapDumpOnOutOfMemoryError\n\
 -XX:-OmitStackTraceInFastThrow\n\
 -XX:-OmitStackTraceInFastThrow\n\
 -XX:+UnlockExperimentalVMOptions\n\
 -XX:+UnlockExperimentalVMOptions\n\
 -XX:+UseG1GC\n\
 -XX:+UseG1GC\n\
@@ -71,7 +71,7 @@ jvm.suggest.options=\
 -XX:-UseGCOverheadLimit\n\
 -XX:-UseGCOverheadLimit\n\
 -XX:+UseTLAB\n\
 -XX:+UseTLAB\n\
 -XX:+DisableExplicitGC\n\
 -XX:+DisableExplicitGC\n\
--XX:+HeapDumpOnOutOfMemoryError\n\
+-XX:-HeapDumpOnOutOfMemoryError\n\
 -XX:+UnlockExperimentalVMOptions\n\
 -XX:+UnlockExperimentalVMOptions\n\
 -XX:+UseG1GC\n\
 -XX:+UseG1GC\n\
 -XX:InitiatingHeapOccupancyPercent=45\n\
 -XX:InitiatingHeapOccupancyPercent=45\n\
@@ -101,7 +101,7 @@ jvm.thumbnail.options=\
 -XX:-UseGCOverheadLimit\n\
 -XX:-UseGCOverheadLimit\n\
 -XX:+UseTLAB\n\
 -XX:+UseTLAB\n\
 -XX:+DisableExplicitGC\n\
 -XX:+DisableExplicitGC\n\
--XX:+HeapDumpOnOutOfMemoryError\n\
+-XX:-HeapDumpOnOutOfMemoryError\n\
 -XX:-OmitStackTraceInFastThrow\n\
 -XX:-OmitStackTraceInFastThrow\n\
 -XX:+UnlockExperimentalVMOptions\n\
 -XX:+UnlockExperimentalVMOptions\n\
 -XX:+UseG1GC\n\
 -XX:+UseG1GC\n\