diff --git a/bin/hbase b/bin/hbase index d7a8069f17..a4e362054b 100755 --- a/bin/hbase +++ b/bin/hbase @@ -392,6 +392,9 @@ elif [ "$COMMAND" = "regionserver" ] ; then CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer' if [ "$1" != "stop" ] ; then HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS" + if [[ $HBASE_REGIONSERVER_OPTS == *UseG1GC* ]] ; then + HBASE_OPTS=${HBASE_OPTS/'-XX:+UseConcMarkSweepGC'/''} + fi fi elif [ "$COMMAND" = "thrift" ] ; then CLASS='org.apache.hadoop.hbase.thrift.ThriftServer'