You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2017/03/20 17:41:39 UTC
[06/28] hbase git commit: HBASE-17426 Inconsistent environment
variable names for enabling JMX
HBASE-17426 Inconsistent environment variable names for enabling JMX
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8ad3add0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8ad3add0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8ad3add0
Branch: refs/heads/hbase-12439
Commit: 8ad3add0d4a469141928ab0048cf7d9d5236c5b0
Parents: e2a070c
Author: CHIA-PING TSAI <ch...@gmail.com>
Authored: Fri Mar 17 09:09:36 2017 +0800
Committer: CHIA-PING TSAI <ch...@gmail.com>
Committed: Fri Mar 17 09:10:06 2017 +0800
----------------------------------------------------------------------
bin/hbase-config.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8ad3add0/bin/hbase-config.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index e001e83..2e95ae7 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"