hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chia7...@apache.org
Subject hbase git commit: HBASE-17426 Inconsistent environment variable names for enabling JMX
Date Fri, 17 Mar 2017 02:29:12 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 6be8d2041 -> e1eaf612f


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/e1eaf612
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e1eaf612
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e1eaf612

Branch: refs/heads/branch-1
Commit: e1eaf612f6992f3339065c27cd7e3aba5e3e15a1
Parents: 6be8d20
Author: CHIA-PING TSAI <chia7712@gmail.com>
Authored: Fri Mar 17 09:09:36 2017 +0800
Committer: CHIA-PING TSAI <chia7712@gmail.com>
Committed: Fri Mar 17 10:28:54 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/e1eaf612/bin/hbase-config.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 5db74cf..2f1a254 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"


Mime
View raw message