From e1eaf612f6992f3339065c27cd7e3aba5e3e15a1 Mon Sep 17 00:00:00 2001
From: CHIA-PING TSAI <chia7712@gmail.com>
Date: Fri, 17 Mar 2017 09:09:36 +0800
Subject: [PATCH] HBASE-17426 Inconsistent environment variable names for
 enabling JMX

---
 bin/hbase-config.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 5db74cff44a..2f1a254eb05 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -96,6 +96,9 @@ HBASE_CONF_DIR="${HBASE_CONF_DIR:-$HBASE_HOME/conf}"
 HBASE_REGIONSERVERS="${HBASE_REGIONSERVERS:-$HBASE_CONF_DIR/regionservers}"
 # List of hbase secondary masters.
 HBASE_BACKUP_MASTERS="${HBASE_BACKUP_MASTERS:-$HBASE_CONF_DIR/backup-masters}"
+if [ -n "$HBASE_JMX_BASE" ] && [ -z "$HBASE_JMX_OPTS" ]; then
+  HBASE_JMX_OPTS="$HBASE_JMX_BASE"
+fi
 # Thrift JMX opts
 if [ -n "$HBASE_JMX_OPTS" ] && [ -z "$HBASE_THRIFT_JMX_OPTS" ]; then
   HBASE_THRIFT_JMX_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxremote.port=10103"