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:
parent
9d3bb109db
commit
d3f3ccee7a
|
@ -129,6 +129,7 @@ public class CatalogTracker {
|
|||
public void start() throws IOException, InterruptedException {
|
||||
this.rootRegionTracker.start();
|
||||
this.metaNodeTracker.start();
|
||||
LOG.debug("Starting catalog tracker " + this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -136,8 +137,7 @@ public class CatalogTracker {
|
|||
* Interrupts any ongoing waits.
|
||||
*/
|
||||
public void stop() {
|
||||
LOG.debug("Stopping catalog tracker " + this.connection.toString() +
|
||||
"; will interrupt blocked waits on root and meta");
|
||||
LOG.debug("Stopping catalog tracker " + this);
|
||||
this.stopped = true;
|
||||
this.rootRegionTracker.stop();
|
||||
this.metaNodeTracker.stop();
|
||||
|
|
|
@ -216,7 +216,6 @@ public class HConnectionManager {
|
|||
new ConcurrentHashMap<String, HRegionInterface>();
|
||||
|
||||
private final RootRegionTracker rootRegionTracker;
|
||||
private final String identifier;
|
||||
|
||||
/**
|
||||
* 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
|
||||
this.zooKeeper = getZooKeeperWatcher();
|
||||
this.identifier = this.zooKeeper.toString();
|
||||
masterAddressTracker = new MasterAddressTracker(this.zooKeeper, this);
|
||||
zooKeeper.registerListener(masterAddressTracker);
|
||||
masterAddressTracker.start();
|
||||
|
@ -278,11 +276,6 @@ public class HConnectionManager {
|
|||
return this.conf;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return this.identifier;
|
||||
}
|
||||
|
||||
private long getPauseTime(int tries) {
|
||||
int ntries = tries;
|
||||
if (ntries >= HConstants.RETRY_BACKOFF.length) {
|
||||
|
|
Loading…
Reference in New Issue