diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java index 8c8fd2a2ded..7615d6e098a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java @@ -27,14 +27,13 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.NotServingRegionException; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.UnknownScannerException; import org.apache.hadoop.hbase.client.metrics.ScanMetrics; import org.apache.hadoop.hbase.exceptions.OutOfOrderScannerNextException; @@ -216,14 +215,14 @@ public class ClientScanner extends AbstractClientScanner { checkScanStopRow(endKey) || done) { close(); - if (LOG.isDebugEnabled()) { - LOG.debug("Finished " + this.currentRegion); + if (LOG.isTraceEnabled()) { + LOG.trace("Finished " + this.currentRegion); } return false; } localStartKey = endKey; - if (LOG.isDebugEnabled()) { - LOG.debug("Finished " + this.currentRegion); + if (LOG.isTraceEnabled()) { + LOG.trace("Finished " + this.currentRegion); } } else { localStartKey = this.scan.getStartRow(); 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 30d08b4e32c..61e8f00ce33 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 @@ -402,8 +402,10 @@ public class ZKAssign { public static boolean deleteNode(ZooKeeperWatcher zkw, String encodedRegionName, EventType expectedState, int expectedVersion) throws KeeperException, KeeperException.NoNodeException { - LOG.debug(zkw.prefix("Deleting existing unassigned " + + if (LOG.isTraceEnabled()) { + LOG.trace(zkw.prefix("Deleting existing unassigned " + "node " + encodedRegionName + " in expected state " + expectedState)); + } String node = getNodeName(zkw, encodedRegionName); zkw.sync(node); Stat stat = new Stat(); 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 bf57a1ac39b..a078a524401 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 @@ -477,7 +477,7 @@ public class AssignmentManager extends ZooKeeperListener { // If we found user regions out on cluster, its a failover. if (failover) { - LOG.info("Found regions out on cluster or in RIT; failover"); + LOG.info("Found regions out on cluster or in RIT; presuming failover"); // Process list of dead servers and regions in RIT. // See HBASE-4580 for more information. processDeadServersAndRecoverLostRegions(deadServers); @@ -803,11 +803,11 @@ public class AssignmentManager extends ZooKeeperListener { long startTime = System.currentTimeMillis(); if (LOG.isDebugEnabled()) { boolean lateEvent = createTime < (startTime - 15000); - LOG.debug("Handling transition=" + rt.getEventType() + + LOG.debug("Handling " + rt.getEventType() + ", server=" + sn + ", region=" + (prettyPrintedRegionName == null ? "null" : prettyPrintedRegionName) + (lateEvent ? ", which is more than 15 seconds late" : "") + - ", current state from region state map =" + regionState); + ", current_state=" + regionState); } // We don't do anything for this event, // so separate it out, no need to lock/unlock anything @@ -2198,9 +2198,9 @@ public class AssignmentManager extends ZooKeeperListener { LOG.warn("Can't find a destination for " + encodedName); return null; } - LOG.debug("No previous transition plan was found (or we are ignoring " + + LOG.debug("No previous transition plan found (or ignoring " + "an existing plan) for " + region.getRegionNameAsString() + - " so generated a random one; " + randomPlan + "; " + + "; generated random plan=" + randomPlan + "; " + serverManager.countOfRegionServers() + " (online=" + serverManager.getOnlineServers().size() + ", available=" + destServers.size() + ") available servers" + @@ -3105,9 +3105,8 @@ public class AssignmentManager extends ZooKeeperListener { if (addressFromZK != null) { // if we get something from ZK, we will use the data boolean matchZK = addressFromZK.equals(serverName); - LOG.debug("based on ZK, current region=" + hri.getRegionNameAsString() + - " is on server=" + addressFromZK + - " server being checked=: " + serverName); + LOG.debug("Checking region=" + hri.getRegionNameAsString() + ", zk server=" + addressFromZK + + " current=" + serverName + ", matches=" + matchZK); return matchZK; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 82d77e93f4a..99e29a13f1f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -1072,12 +1072,11 @@ MasterServices, Server { } } - int assigned = 0; boolean beingExpired = false; status.setStatus("Assigning System Regions"); - for(Map.Entry entry: allRegions.entrySet()) { + for (Map.Entry entry: allRegions.entrySet()) { HRegionInfo regionInfo = entry.getKey(); ServerName currServer = entry.getValue(); @@ -1097,14 +1096,12 @@ MasterServices, Server { assignmentManager.assign(regionInfo, true); // Make sure a region location is set. this.assignmentManager.waitForAssignment(regionInfo); - assigned++; if (beingExpired && this.distributedLogReplay) { // In Replay WAL Mode, we need the new region server online this.fileSystemManager.splitLog(currServer); } } else if (rit && !regionLocation) { if (!waitVerifiedRegionLocation(regionInfo)) return; - assigned++; } else { // Region already assigned. We didn't assign it. Add to in-memory state. this.assignmentManager.regionOnline(regionInfo, currServer); @@ -1113,7 +1110,7 @@ MasterServices, Server { if (!this.assignmentManager.getZKTable().isEnabledTable(regionInfo.getTableName())) { this.assignmentManager.setEnabledTable(regionInfo.getTableName()); } - LOG.info("System Regions assigned=" + assigned + ", rit=" + rit + + LOG.info("System region " + regionInfo.getRegionNameAsString() + " assigned, rit=" + rit + ", location=" + catalogTracker.getMetaLocation()); } status.setStatus("System Regions assigned."); @@ -1146,7 +1143,7 @@ MasterServices, Server { .getAdmin(currServer), regionInfo.getRegionName()) != null; } catch (IOException e) { - LOG.info("Failed to contact server: "+currServer, e); + LOG.info("Failed verifying location=" + currServer + ", exception=" + e); } return false; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java index ee5adaf4147..0817883e4d7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java @@ -260,7 +260,7 @@ public class RegionStates { hri, state, System.currentTimeMillis(), newServerName); RegionState oldState = regionStates.put(regionName, regionState); if (oldState == null || oldState.getState() != regionState.getState()) { - LOG.info("Transitioned from " + oldState + " to " + regionState); + LOG.info("Transitioned " + oldState + " to " + regionState); } if (newServerName != null || ( state != State.PENDING_CLOSE && state != State.CLOSING)) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index de0857bbdd6..79a838c0f9f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -470,13 +470,13 @@ public class ServerManager { return; } if (!this.onlineServers.containsKey(serverName)) { - LOG.warn("Received expiration of " + serverName + - " but server is not currently online"); + LOG.warn("Expiration of " + serverName + + " but server not online"); } if (this.deadservers.isDeadServer(serverName)) { // TODO: Can this happen? It shouldn't be online in this case? - LOG.warn("Received expiration of " + serverName + - " but server shutdown is already in progress"); + LOG.warn("Expiration of " + serverName + + " but server shutdown already in progress"); return; } // Remove the server from the known servers lists and update load info BUT @@ -552,7 +552,7 @@ public class ServerManager { } if (!services.getAssignmentManager().isFailoverCleanupDone()) { - LOG.info("AssignmentManager hasn't finished failover cleanup"); + LOG.info("AssignmentManager hasn't finished failover cleanup; waiting"); } for(ServerName tmpServerName : requeuedDeadServers.keySet()){ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java index caad2d9f61b..c0fb4bfa8ab 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java @@ -221,16 +221,16 @@ public class SplitLogManager extends ZooKeeperListener { this.timeout = conf.getInt("hbase.splitlog.manager.timeout", DEFAULT_TIMEOUT); this.unassignedTimeout = conf.getInt("hbase.splitlog.manager.unassigned.timeout", DEFAULT_UNASSIGNED_TIMEOUT); - LOG.info("timeout=" + timeout + ", unassigned timeout=" + unassignedTimeout); + this.distributedLogReplay = this.conf.getBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, + HConstants.DEFAULT_DISTRIBUTED_LOG_REPLAY_CONFIG); + LOG.info("Timeout=" + timeout + ", unassigned timeout=" + unassignedTimeout + + ", distributedLogReplay=" + this.distributedLogReplay); this.serverName = serverName; this.timeoutMonitor = new TimeoutMonitor( conf.getInt("hbase.splitlog.manager.timeoutmonitor.period", 1000), stopper); this.failedDeletions = Collections.synchronizedSet(new HashSet()); - this.distributedLogReplay = this.conf.getBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, - HConstants.DEFAULT_DISTRIBUTED_LOG_REPLAY_CONFIG); - LOG.info("distributedLogReplay = " + this.distributedLogReplay); if (!masterRecovery) { Threads.setDaemonThreadRunning(timeoutMonitor.getThread(), serverName diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java index 37c9b722cac..b3bce491308 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java @@ -124,7 +124,7 @@ public class OpenedRegionHandler extends EventHandler implements TotesHRegionInf } private boolean deleteOpenedNode(int expectedVersion) { - debugLog(regionInfo, "Handling OPENED event for " + + debugLog(regionInfo, "Handling OPENED of " + this.regionInfo.getShortNameToLog() + " from " + this.sn.toString() + "; deleting unassigned node"); try {