diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java index 9cc2018..ab73c95 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java @@ -783,8 +783,7 @@ public class ZKAssign { throws KeeperException { String encoded = region.getEncodedName(); if(LOG.isDebugEnabled()) { - LOG.debug(zkw.prefix("Attempting to transition node " + - HRegionInfo.prettyPrint(encoded) + + LOG.debug(zkw.prefix("Transitioning " + HRegionInfo.prettyPrint(encoded) + " from " + beginState.toString() + " to " + endState.toString())); } @@ -995,9 +994,7 @@ public class ZKAssign { List znodes = ZKUtil.listChildrenAndWatchForNewChildren(zkw, zkw.assignmentZNode); if (znodes != null && !znodes.isEmpty()) { - for (String znode : znodes) { - LOG.debug("ZK RIT -> " + znode); - } + LOG.debug("Waiting on RIT: " + znodes); } Thread.sleep(100); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index 6e5cc90..51c0709 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -1851,7 +1851,7 @@ public class AssignmentManager extends ZooKeeperListener { LOG.debug("Server stopped/aborted; skipping assign of " + region); return; } - LOG.info("Assigning region " + region.getRegionNameAsString() + + LOG.info("Assigning " + region.getRegionNameAsString() + " to " + plan.getDestination().toString()); // Transition RegionState to PENDING_OPEN currentState = regionStates.updateRegionState(region, diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index e6c991e..c0cf211 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1426,17 +1426,12 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa } private HLog getMetaWAL() throws IOException { - if (this.hlogForMeta == null) { - final String logName - = HLogUtil.getHLogDirectoryName(this.serverNameFromMasterPOV.toString()); - - Path logdir = new Path(rootDir, logName); - if (LOG.isDebugEnabled()) LOG.debug("logdir=" + logdir); - - this.hlogForMeta = HLogFactory.createMetaHLog(this.fs.getBackingFs(), - rootDir, logName, this.conf, getMetaWALActionListeners(), - this.serverNameFromMasterPOV.toString()); - } + if (this.hlogForMeta != null) return this.hlogForMeta; + final String logName = HLogUtil.getHLogDirectoryName(this.serverNameFromMasterPOV.toString()); + Path logdir = new Path(rootDir, logName); + if (LOG.isDebugEnabled()) LOG.debug("logdir=" + logdir); + this.hlogForMeta = HLogFactory.createMetaHLog(this.fs.getBackingFs(), rootDir, logName, + this.conf, getMetaWALActionListeners(), this.serverNameFromMasterPOV.toString()); return this.hlogForMeta; } @@ -1478,7 +1473,7 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa MetaLogRoller tmpLogRoller = new MetaLogRoller(this, this); String n = Thread.currentThread().getName(); Threads.setDaemonThreadRunning(tmpLogRoller.getThread(), - n + "MetaLogRoller", uncaughtExceptionHandler); + n + "-MetaLogRoller", uncaughtExceptionHandler); this.metaHLogRoller = tmpLogRoller; tmpLogRoller = null; listeners.add(this.metaHLogRoller); @@ -1660,8 +1655,7 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa //currently, we don't care about the region as much as we care about the //table.. (hence checking the tablename below) //_ROOT_ and .META. regions have separate WAL. - if (regionInfo != null && - regionInfo.isMetaTable()) { + if (regionInfo != null && regionInfo.isMetaTable()) { return getMetaWAL(); } return this.hlog; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index 1d5d1df..ee53169 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -559,7 +559,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { if (readOnProp != null){ return Boolean.parseBoolean(readOnProp); } else { - return conf.getBoolean(propName, true); + return conf.getBoolean(propName, false); } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java index ce7c9d0..c1e6d30 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java @@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil; +import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.zookeeper.ZKAssign; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -284,6 +285,8 @@ public class TestDrainingServer { if (!rs.getRegionServer().getRegionsInTransitionInRS().isEmpty()) { done = false; } + // Sleep some else we spam the log w/ notice that servers are not yet alive. + Threads.sleep(10); } } } @@ -292,6 +295,4 @@ public class TestDrainingServer { return TEST_UTIL.getMiniHBaseCluster().countServedRegions() == (COUNT_OF_REGIONS + 1 /*catalog regions*/); } - -} - +} \ No newline at end of file