From 7f6672eb9e639784d36fa1d75db5cb98badc9c96 Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Mon, 27 Apr 2020 09:24:46 -0700
Subject: [PATCH] HBASE-24143 [JDK11] Switch default garbage collector from CMS
 ; Addendum (#1594)

Signed-off-by: Sean Busbey <busbey@apache.org>
---
 bin/hbase-config.sh | 4 ++++
 conf/hbase-env.sh   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 22ea1b1215b..536b5379b12 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -134,6 +134,10 @@ if [ -z "$HBASE_ENV_INIT" ] && [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
   export HBASE_ENV_INIT="true"
 fi
 
+# These variables can be specified in hbase-env.sh, so these defines follow sourcing of that script.
+export GREP="${GREP-grep}"
+export SED="${SED-sed}"
+
 # Verify if hbase has the mlock agent
 if [ "$HBASE_REGIONSERVER_MLOCK" = "true" ]; then
   MLOCK_AGENT="$HBASE_HOME/lib/native/libmlockall_agent.so"
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index a718c751d44..e0f9c01bc99 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -140,5 +140,5 @@
 # export HBASE_DISABLE_HADOOP_CLASSPATH_LOOKUP="true"
 
 # Override text processing tools for use by these launch scripts.
-export GREP="${GREP-grep}"
-export SED="${SED-sed}"
+# export GREP="${GREP-grep}"
+# export SED="${SED-sed}"