Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE in TestCatalogTracker up on hudson; removed toString on HConnection 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1006344 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-10-10 19:36:31 +00:00
parent 9d3bb109db
commit d3f3ccee7a
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
View File

@ -129,6 +129,7 @@ public class CatalogTracker {
public void start() throws IOException, InterruptedException { public void start() throws IOException, InterruptedException {
this.rootRegionTracker.start(); this.rootRegionTracker.start();
this.metaNodeTracker.start(); this.metaNodeTracker.start();
LOG.debug("Starting catalog tracker " + this);
} }
/** /**
@ -136,8 +137,7 @@ public class CatalogTracker {
* Interrupts any ongoing waits. * Interrupts any ongoing waits.
*/ */
public void stop() { public void stop() {
LOG.debug("Stopping catalog tracker " + this.connection.toString() + LOG.debug("Stopping catalog tracker " + this);
"; will interrupt blocked waits on root and meta");
this.stopped = true; this.stopped = true;
this.rootRegionTracker.stop(); this.rootRegionTracker.stop();
this.metaNodeTracker.stop(); this.metaNodeTracker.stop();

7
src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
View File

@ -216,7 +216,6 @@ public class HConnectionManager {
new ConcurrentHashMap<String, HRegionInterface>(); new ConcurrentHashMap<String, HRegionInterface>();
private final RootRegionTracker rootRegionTracker; private final RootRegionTracker rootRegionTracker;
private final String identifier;
/** /**
* Map of table to table {@link HRegionLocation}s. The table key is made * Map of table to table {@link HRegionLocation}s. The table key is made
@ -262,7 +261,6 @@ public class HConnectionManager {
// initialize zookeeper and master address manager // initialize zookeeper and master address manager
this.zooKeeper = getZooKeeperWatcher(); this.zooKeeper = getZooKeeperWatcher();
this.identifier = this.zooKeeper.toString();
masterAddressTracker = new MasterAddressTracker(this.zooKeeper, this); masterAddressTracker = new MasterAddressTracker(this.zooKeeper, this);
zooKeeper.registerListener(masterAddressTracker); zooKeeper.registerListener(masterAddressTracker);
masterAddressTracker.start(); masterAddressTracker.start();
@ -278,11 +276,6 @@ public class HConnectionManager {
return this.conf; return this.conf;
} }
@Override
public String toString() {
return this.identifier;
}
private long getPauseTime(int tries) { private long getPauseTime(int tries) {
int ntries = tries; int ntries = tries;
if (ntries >= HConstants.RETRY_BACKOFF.length) { if (ntries >= HConstants.RETRY_BACKOFF.length) {