You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/10/10 21:36:31 UTC
svn commit: r1006344 - in /hbase/trunk/src/main/java/org/apache/hadoop/hbase:
catalog/CatalogTracker.java client/HConnectionManager.java
Author: stack
Date: Sun Oct 10 19:36:31 2010
New Revision: 1006344
URL: http://svn.apache.org/viewvc?rev=1006344&view=rev
Log:
Fix NPE in TestCatalogTracker up on hudson; removed toString on HConnection
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java?rev=1006344&r1=1006343&r2=1006344&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java Sun Oct 10 19:36:31 2010
@@ -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();
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1006344&r1=1006343&r2=1006344&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Sun Oct 10 19:36:31 2010
@@ -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) {