HBASE-2114 Can't start HBase in trunk (JD and Kay Kay via JD)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@898150 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
05e631f7d9
commit
8854ebea34
|
@ -152,6 +152,7 @@ Release 0.21.0 - Unreleased
|
||||||
(Lars George and Gary Helmling via Stack)
|
(Lars George and Gary Helmling via Stack)
|
||||||
HBASE-2093 [stargate] RowSpec parse bug
|
HBASE-2093 [stargate] RowSpec parse bug
|
||||||
HBASE-2100 [EC2] Adjust fs.file-max
|
HBASE-2100 [EC2] Adjust fs.file-max
|
||||||
|
HBASE-2114 Can't start HBase in trunk (JD and Kay Kay via JD)
|
||||||
|
|
||||||
IMPROVEMENTS
|
IMPROVEMENTS
|
||||||
HBASE-1760 Cleanup TODOs in HTable
|
HBASE-1760 Cleanup TODOs in HTable
|
||||||
|
|
9
ivy.xml
9
ivy.xml
|
@ -92,6 +92,10 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency org="org.apache.lucene" name="lucene-core"
|
<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.
|
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"/>
|
rev="${hadoop-mapred.version}" conf="test->default" transitive="false"/>
|
||||||
<dependency org="org.apache.commons" name="commons-math"
|
<dependency org="org.apache.commons" name="commons-math"
|
||||||
rev="${commons-math.version}" conf="test->default"/>
|
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>
|
</dependencies>
|
||||||
</ivy-module>
|
</ivy-module>
|
||||||
|
|
|
@ -1199,7 +1199,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
|
||||||
(new LocalHBaseCluster(conf)).startup();
|
(new LocalHBaseCluster(conf)).startup();
|
||||||
} else {
|
} else {
|
||||||
Constructor<? extends HMaster> c =
|
Constructor<? extends HMaster> c =
|
||||||
clazz.getConstructor(HBaseConfiguration.class);
|
clazz.getConstructor(Configuration.class);
|
||||||
HMaster master = c.newInstance(conf);
|
HMaster master = c.newInstance(conf);
|
||||||
if (master.shutdownRequested.get()) {
|
if (master.shutdownRequested.get()) {
|
||||||
LOG.info("Won't bring the Master up as a shutdown is requested");
|
LOG.info("Won't bring the Master up as a shutdown is requested");
|
||||||
|
|
|
@ -2323,7 +2323,7 @@ public class HRegionServer implements HConstants, HRegionInterface,
|
||||||
LOG.info("vmInputArguments=" + runtime.getInputArguments());
|
LOG.info("vmInputArguments=" + runtime.getInputArguments());
|
||||||
}
|
}
|
||||||
Constructor<? extends HRegionServer> c =
|
Constructor<? extends HRegionServer> c =
|
||||||
regionServerClass.getConstructor(HBaseConfiguration.class);
|
regionServerClass.getConstructor(Configuration.class);
|
||||||
HRegionServer hrs = c.newInstance(conf);
|
HRegionServer hrs = c.newInstance(conf);
|
||||||
Thread t = new Thread(hrs);
|
Thread t = new Thread(hrs);
|
||||||
t.setName("regionserver" + hrs.server.getListenerAddress());
|
t.setName("regionserver" + hrs.server.getListenerAddress());
|
||||||
|
|
Loading…
Reference in New Issue