Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1332450 - /hbase/trunk/bin/hbase-config.sh
Date: Mon, 30 Apr 2012 22:26:32 -0000
To: commits@hbase.apache.org
From: stack@apache.org
Message-Id: <20120430222632.144FF23889E7@eris.apache.org>

Author: stack
Date: Mon Apr 30 22:26:31 2012
New Revision: 1332450

URL: http://svn.apache.org/viewvc?rev=1332450&view=rev
Log:
HBASE-5879 Enable JMX metrics collection for the Thrift proxy

Modified:
    hbase/trunk/bin/hbase-config.sh

Modified: hbase/trunk/bin/hbase-config.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-config.sh?rev=1332450&r1=1332449&r2=1332450&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-config.sh (original)
+++ hbase/trunk/bin/hbase-config.sh Mon Apr 30 22:26:31 2012
@@ -75,6 +75,14 @@ HBASE_CONF_DIR="${HBASE_CONF_DIR:-$HBASE
 HBASE_REGIONSERVERS="${HBASE_REGIONSERVERS:-$HBASE_CONF_DIR/regionservers}"
 # List of hbase secondary masters.
 HBASE_BACKUP_MASTERS="${HBASE_BACKUP_MASTERS:-$HBASE_CONF_DIR/backup-masters}"
+# Thrift jmx opts
+if [ -z "$HBASE_THRIFT_JMX_OPTS" ]; then
+  HBASE_THRIFT_JMX_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxremote.port=8093"
+fi
+# Thrift opts
+if [ -z "$HBASE_THRIFT_OPTS" ]; then
+  export HBASE_THRIFT_OPTS="$HBASE_THRIFT_JMX_OPTS"
+fi
 
 # Source the hbase-env.sh.  Will have JAVA_HOME defined.
 if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then