You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2010/01/12 02:57:07 UTC
svn commit: r898150 - in /hadoop/hbase/trunk: CHANGES.txt ivy.xml
src/java/org/apache/hadoop/hbase/master/HMaster.java
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: jdcryans
Date: Tue Jan 12 01:57:07 2010
New Revision: 898150
URL: http://svn.apache.org/viewvc?rev=898150&view=rev
Log:
HBASE-2114 Can't start HBase in trunk (JD and Kay Kay via JD)
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/ivy.xml
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=898150&r1=898149&r2=898150&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jan 12 01:57:07 2010
@@ -152,6 +152,7 @@
(Lars George and Gary Helmling via Stack)
HBASE-2093 [stargate] RowSpec parse bug
HBASE-2100 [EC2] Adjust fs.file-max
+ HBASE-2114 Can't start HBase in trunk (JD and Kay Kay via JD)
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hadoop/hbase/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/ivy.xml?rev=898150&r1=898149&r2=898150&view=diff
==============================================================================
--- hadoop/hbase/trunk/ivy.xml (original)
+++ hadoop/hbase/trunk/ivy.xml Tue Jan 12 01:57:07 2010
@@ -91,7 +91,11 @@
<exclude conf="test"/>
</dependency>
<dependency org="org.apache.lucene" name="lucene-core"
- rev="${lucene.version}" conf="common->default" />
+ rev="${lucene.version}" conf="common->default" />
+ <dependency org="log4j" name="log4j"
+ rev="${log4j.version}" conf="common->master">
+ <exclude conf="jmx,mail,jms"/>
+ </dependency>
<!--
TODO: Enter URL in ivysettings.xml that stores the artifacts of Zookeeper / thrift.
@@ -110,9 +114,6 @@
rev="${hadoop-mapred.version}" conf="test->default" transitive="false"/>
<dependency org="org.apache.commons" name="commons-math"
rev="${commons-math.version}" conf="test->default"/>
- <dependency org="log4j" name="log4j"
- rev="${log4j.version}" conf="test->master">
- <exclude conf="jmx,mail,jms"/>
- </dependency>
+
</dependencies>
</ivy-module>
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java?rev=898150&r1=898149&r2=898150&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java Tue Jan 12 01:57:07 2010
@@ -1199,7 +1199,7 @@
(new LocalHBaseCluster(conf)).startup();
} else {
Constructor<? extends HMaster> c =
- clazz.getConstructor(HBaseConfiguration.class);
+ clazz.getConstructor(Configuration.class);
HMaster master = c.newInstance(conf);
if (master.shutdownRequested.get()) {
LOG.info("Won't bring the Master up as a shutdown is requested");
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=898150&r1=898149&r2=898150&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Jan 12 01:57:07 2010
@@ -2323,7 +2323,7 @@
LOG.info("vmInputArguments=" + runtime.getInputArguments());
}
Constructor<? extends HRegionServer> c =
- regionServerClass.getConstructor(HBaseConfiguration.class);
+ regionServerClass.getConstructor(Configuration.class);
HRegionServer hrs = c.newInstance(conf);
Thread t = new Thread(hrs);
t.setName("regionserver" + hrs.server.getListenerAddress());