From 5f5814ce274f8f2aefd50d29ce67c19f966fa3ac Mon Sep 17 00:00:00 2001
From: Shawn Heisey <elyograg@apache.org>
Date: Tue, 31 Mar 2015 15:54:05 +0000
Subject: [PATCH] SOLR-7319: Revert previous patch, return to discussion.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1670370 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt     | 15 ---------------
 solr/bin/solr.in.cmd |  1 -
 solr/bin/solr.in.sh  |  1 -
 3 files changed, 17 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 276076ce212..f9db934acc1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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
 ----------------------
 
diff --git a/solr/bin/solr.in.cmd b/solr/bin/solr.in.cmd
index ff11f62da82..905284ebc2b 100644
--- a/solr/bin/solr.in.cmd
+++ b/solr/bin/solr.in.cmd
@@ -40,7 +40,6 @@ set GC_TUNE=-XX:NewRatio=3 ^
  -XX:+UseCMSInitiatingOccupancyOnly ^
  -XX:CMSInitiatingOccupancyFraction=50 ^
  -XX:CMSMaxAbortablePrecleanTime=6000 ^
- -XX:+PerfDisableSharedMem ^
  -XX:+CMSParallelRemarkEnabled ^
  -XX:+ParallelRefProcEnabled
 
diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh
index 9d33fca5d00..ccaea12f37e 100644
--- a/solr/bin/solr.in.sh
+++ b/solr/bin/solr.in.sh
@@ -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"