svn commit: r1670370 - in /lucene/dev/trunk/solr: CHANGES.txt bin/solr.in.cmd bin/solr.in.sh

[el...@apache.org]

Author: elyograg
Date: Tue Mar 31 15:54:05 2015
New Revision: 1670370

URL: http://svn.apache.org/r1670370
Log:
SOLR-7319: Revert previous patch, return to discussion.

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/bin/solr.in.cmd
    lucene/dev/trunk/solr/bin/solr.in.sh

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1670370&r1=1670369&r2=1670370&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Mar 31 15:54:05 2015
@@ -91,15 +91,6 @@ Upgrading from Solr 5.0
   contain some LGPL-only code. Until that's resolved by Tika, you can download the
   .jar yourself and place it under contrib/extraction/lib.  
 
-* A twitter engineer discovered a JVM bug that causes GC pause problems.  The
-  workaround for those problems makes certain functionality impossible, such as
-  running the jstat program on your Solr instance.  That workaround has been
-  implemented in the bin/solr start scripts.  If you need the missing java
-  functionality, delete the "-XX:+PerfDisableSharedMem" parameter from
-  bin/solr.in.sh or bin/solr.in.cmd.
-
-  http://www.evanjones.ca/jvm-mmap-pause.html
-
 Detailed Change List
 ----------------------
 
@@ -350,12 +341,6 @@ Bug Fixes
 * SOLR-7309: Make bin/solr, bin/post work when Solr installation directory contains spaces
   (Ramkumar Aiyengar, Martijn Koster)
 
-* SOLR-7319: Workaround for the "Four Month Bug" GC pause problem discovered
-  by a twitter software engineer.  This causes GC pauses when JVM statistics
-  are left enabled and there is heavy MMAP write activity.
-  http://www.evanjones.ca/jvm-mmap-pause.html
-  (Shawn Heisey)
-
 Optimizations
 ----------------------
 

Modified: lucene/dev/trunk/solr/bin/solr.in.cmd
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr.in.cmd?rev=1670370&r1=1670369&r2=1670370&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr.in.cmd (original)
+++ lucene/dev/trunk/solr/bin/solr.in.cmd Tue Mar 31 15:54:05 2015
@@ -40,7 +40,6 @@ set GC_TUNE=-XX:NewRatio=3 ^
  -XX:+UseCMSInitiatingOccupancyOnly ^
  -XX:CMSInitiatingOccupancyFraction=50 ^
  -XX:CMSMaxAbortablePrecleanTime=6000 ^
- -XX:+PerfDisableSharedMem ^
  -XX:+CMSParallelRemarkEnabled ^
  -XX:+ParallelRefProcEnabled
 

Modified: lucene/dev/trunk/solr/bin/solr.in.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr.in.sh?rev=1670370&r1=1670369&r2=1670370&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr.in.sh (original)
+++ lucene/dev/trunk/solr/bin/solr.in.sh Tue Mar 31 15:54:05 2015
@@ -37,7 +37,6 @@ GC_TUNE="-XX:NewRatio=3 \
 -XX:PretenureSizeThreshold=64m \
 -XX:+UseCMSInitiatingOccupancyOnly \
 -XX:CMSInitiatingOccupancyFraction=50 \
--XX:+PerfDisableSharedMem \
 -XX:CMSMaxAbortablePrecleanTime=6000 \
 -XX:+CMSParallelRemarkEnabled \
 -XX:+ParallelRefProcEnabled"