You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2012/12/05 18:05:27 UTC

svn commit: r1417527 - in /hbase/trunk: bin/hbase-config.sh conf/hbase-env.sh

Author: jxiang
Date: Wed Dec  5 17:05:27 2012
New Revision: 1417527

URL: http://svn.apache.org/viewvc?rev=1417527&view=rev
Log:
HBASE-7274 Enable JMX metrics collection for REST Server

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

Modified: hbase/trunk/bin/hbase-config.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-config.sh?rev=1417527&r1=1417526&r2=1417527&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-config.sh (original)
+++ hbase/trunk/bin/hbase-config.sh Wed Dec  5 17:05:27 2012
@@ -84,6 +84,15 @@ if [ -z "$HBASE_THRIFT_OPTS" ]; then
   export HBASE_THRIFT_OPTS="$HBASE_THRIFT_JMX_OPTS"
 fi
 
+# REST JMX opts
+if [ -z "$HBASE_REST_JMX_OPTS" ]; then
+  HBASE_REST_JMX_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxremote.port=10105"
+fi
+# REST opts
+if [ -z "$HBASE_REST_OPTS" ]; then
+  export HBASE_REST_OPTS="$HBASE_REST_JMX_OPTS"
+fi
+
 # Source the hbase-env.sh.  Will have JAVA_HOME defined.
 if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
   . "${HBASE_CONF_DIR}/hbase-env.sh"

Modified: hbase/trunk/conf/hbase-env.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/conf/hbase-env.sh?rev=1417527&r1=1417526&r2=1417527&view=diff
==============================================================================
--- hbase/trunk/conf/hbase-env.sh (original)
+++ hbase/trunk/conf/hbase-env.sh Wed Dec  5 17:05:27 2012
@@ -57,6 +57,7 @@ export HBASE_OPTS="$HBASE_OPTS -XX:+UseC
 # export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10102"
 # export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103"
 # export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10104"
+# export HBASE_REST_OPTS="$HBASE_REST_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10105"
 
 # File naming hosts on which HRegionServers will run.  $HBASE_HOME/conf/regionservers by default.
 # export HBASE_REGIONSERVERS=${HBASE_HOME}/conf/regionservers