From fcb4a50701d98004a0a320e95d2a5923f24c4c3e Mon Sep 17 00:00:00 2001
From: Richard Peter <richard.peter@raytheon.com>
Date: Tue, 13 Oct 2015 16:02:00 -0500
Subject: [PATCH] Omaha #3315 - Turn off G1 due to yajsw monitor conflicts

Change-Id: Ib0a8cf470b98f95499ec3d870b6fde30d8b0c5b2

Former-commit-id: 9a3f37953225724a70e603b6d791b2bdc6bbfb8e
---
 build/deploy.edex.awips2/esb/bin/start.sh      |  2 --
 build/deploy.edex.awips2/esb/conf/wrapper.conf | 12 +++---------
 build/deploy.edex.awips2/esb/etc/default.sh    |  1 -
 build/deploy.edex.awips2/esb/etc/request.sh    |  1 -
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/build/deploy.edex.awips2/esb/bin/start.sh b/build/deploy.edex.awips2/esb/bin/start.sh
index 29b5d7e446..dbaabc6e66 100644
--- a/build/deploy.edex.awips2/esb/bin/start.sh
+++ b/build/deploy.edex.awips2/esb/bin/start.sh
@@ -171,6 +171,4 @@ if [ ${RC} -ne 0 ]; then
    exit 1
 fi
 
-export TODAY=`/bin/date +%Y%m%d`
-
 java -Xmx32m -XX:MaxPermSize=12m -XX:ReservedCodeCacheSize=4m -jar ${YAJSW_HOME}/wrapper.jar -c ${EDEX_HOME}/conf/${CONF_FILE} ${WRAPPER_ARGS}
diff --git a/build/deploy.edex.awips2/esb/conf/wrapper.conf b/build/deploy.edex.awips2/esb/conf/wrapper.conf
index 863854ddbf..a0cc1338e5 100644
--- a/build/deploy.edex.awips2/esb/conf/wrapper.conf
+++ b/build/deploy.edex.awips2/esb/conf/wrapper.conf
@@ -94,17 +94,11 @@ wrapper.java.additional.5=-Duser.timezone=GMT
 wrapper.java.additional.6=-Djava.io.tmpdir=${AWIPS2_TEMP}
 
 # garbage collection settings
-wrapper.java.additional.gc.1=-XX:+UseG1GC
-wrapper.java.additional.gc.2=-XX:MaxGCPauseMillis=${MAX_GC_PAUSE}
+wrapper.java.additional.gc.1=-XX:+UseConcMarkSweepGC
+wrapper.java.additional.gc.2=-XX:+CMSIncrementalMode
 wrapper.java.additional.gc.3=-XX:+HeapDumpOnOutOfMemoryError
 wrapper.java.additional.gc.4=-XX:HeapDumpPath=/data/fxa/cave/${SHORT_HOSTNAME}/
 wrapper.java.additional.gc.5=-XX:SoftRefLRUPolicyMSPerMB=${SOFT_REF_LRU_POLICY_MS_PER_MB}
-wrapper.java.additional.gc.6=-XX:+PrintGC
-wrapper.java.additional.gc.7=-XX:+PrintGCDateStamps
-wrapper.java.additional.gc.8=-Xloggc:${EDEX_HOME}/logs/edex-${EDEX_RUN_MODE}-gc-${TODAY}.log
-wrapper.java.additional.gc.9=-XX:-UseGCLogFileRotation
-wrapper.java.additional.gc.10=-XX:NumberOfGCLogFiles=10
-wrapper.java.additional.gc.11=-XX:GCLogFileSize=10M
 
 # use qpid binding URL instead of default address string format
 wrapper.java.additional.qpid.1=-Dqpid.dest_syntax=BURL
@@ -192,7 +186,7 @@ wrapper.on_exit.default=${WRAPPER_ON_EXIT_ACTION}
 wrapper.filter.trigger.oom=java.lang.OutOfMemoryError
 wrapper.filter.action.oom=${WRAPPER_TRIGGER_ACTION}
 
-#********************************************************************fil
+#********************************************************************
 # Wrapper Logging Properties
 #********************************************************************
 # Format of output for the console.  (See docs for formats)
diff --git a/build/deploy.edex.awips2/esb/etc/default.sh b/build/deploy.edex.awips2/esb/etc/default.sh
index 714e86c72d..4466862a6b 100644
--- a/build/deploy.edex.awips2/esb/etc/default.sh
+++ b/build/deploy.edex.awips2/esb/etc/default.sh
@@ -25,7 +25,6 @@ if [ $HIGH_MEM == "on" ]; then
     export MAX_MEM=2560
 fi
 
-export MAX_GC_PAUSE=200
 export MAX_PERM_SIZE=128m
 export EDEX_JMX_PORT=1616
 export EDEX_DEBUG_PORT=5005
diff --git a/build/deploy.edex.awips2/esb/etc/request.sh b/build/deploy.edex.awips2/esb/etc/request.sh
index b208ab264c..adab74fc07 100644
--- a/build/deploy.edex.awips2/esb/etc/request.sh
+++ b/build/deploy.edex.awips2/esb/etc/request.sh
@@ -24,7 +24,6 @@ if [ $HIGH_MEM == "on" ]; then
     export MAX_MEM=3072
 fi
 
-export MAX_GC_PAUSE=100
 export SERIALIZE_POOL_MAX_SIZE=24
 export SERIALIZE_STREAM_INIT_SIZE_MB=2
 export SERIALIZE_STREAM_MAX_SIZE_MB=8