Author: nspiegelberg
Date: Tue Sep 27 02:40:53 2011
New Revision: 1176169
URL: http://svn.apache.org/viewvc?rev=1176169&view=rev
Log:
RestartMetaTest: remove hbase-default.xml reference
Summary:
* hbase-default.xml is no longer in conf/.
* separated out JDWP options into a separate variable so it is easier to
disable when running RestartMetaTest (for ProcessBasedCluster test).
Test Plan:
ran RestartMetaTest and ensured process based cluster tests starts up as
expected in hbase-trunk.
DiffCamp Revision: 117645
Reviewed By: kranganathan
CC: kranganathan
Revert Plan:
OK
Modified:
hbase/branches/0.89/bin/hbase-config.sh
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/manual/utils/ProcessBasedLocalHBaseCluster.java
Modified: hbase/branches/0.89/bin/hbase-config.sh
URL:
http://svn.apache.org/viewvc/hbase/branches/0.89/bin/hbase-config.sh?rev=1176169&r1=1176168&r2=1176169&view=diff
==============================================================================
--- hbase/branches/0.89/bin/hbase-config.sh (original)
+++ hbase/branches/0.89/bin/hbase-config.sh Tue Sep 27 02:40:53 2011
@@ -124,12 +124,15 @@ HBASE_YOURKIT_PROFILE="-agentlib:yjpagen
HBASE_GC_OPTIONS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps
-Xloggc:$HBASE_HOME/logs/gc-hbase.log"
+HBASE_MASTER_JDWP_OPTIONS="-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8070"
+HBASE_REGIONSERVER_JDWP_OPTIONS="-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8071"
+
# Java debugging options.
# By default, local hbase instances are setup with the remote debugging
# enabled for the HMaster (which also functions as regionserver) on port 1044
# Zookeeper debug is configured on port 1045
-HBASE_MASTER_DBG_OPTS="-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8070 $HBASE_GC_OPTIONS"
-HBASE_REGIONSERVER_DBG_OPTS="-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8071 $HBASE_GC_OPTIONS"
+HBASE_MASTER_DBG_OPTS="$HBASE_MASTER_JDWP_OPTIONS $HBASE_GC_OPTIONS"
+HBASE_REGIONSERVER_DBG_OPTS="$HBASE_REGIONSERVER_JDWP_OPTIONS
$HBASE_GC_OPTIONS"
HBASE_ZOOKEEPER_DBG_OPTS="-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8072"
export HBASE_MASTER_OPTS="$HBASE_MASTER_DBG_OPTS $HBASE_MASTER_JMX_OPTS"
Modified:
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/manual/utils/ProcessBasedLocalHBaseCluster.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/manual/utils/ProcessBasedLocalHBaseCluster.java?rev=1176169&r1=1176168&r2=1176169&view=diff
==============================================================================
---
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/manual/utils/ProcessBasedLocalHBaseCluster.java
(original)
+++
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/manual/utils/ProcessBasedLocalHBaseCluster.java
Tue Sep 27 02:40:53 2011
@@ -222,7 +222,6 @@ public class ProcessBasedLocalHBaseClust
executeCommand("mkdir -p " + dir);
writeStringToFile(conf, dir + "/" + "hbase-site.xml");
- executeCommand("cp " + hbaseHome_ + "/conf/hbase-default.xml " + dir);
Map<String, String> envOverrides = new HashMap<String, String>();
envOverrides.put("HBASE_LOG_DIR", dir);
