From e1fb762394dbdf3b7c6aa34596d2792eb0dd7df8 Mon Sep 17 00:00:00 2001 From: "nemo@mbp" Date: Wed, 5 Apr 2017 21:20:40 -0400 Subject: [PATCH] HBASE-16469 Several log refactoring/improvement suggestions --- .../apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java | 1 + .../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 6 +++--- .../hadoop/hbase/regionserver/handler/CloseRegionHandler.java | 2 +- .../java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java index a29a662..abac040 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java @@ -291,7 +291,7 @@ class PreemptiveFastFailInterceptor extends RetryingCallerInterceptor { // If we were able to connect to the server, reset the failure // information. if (couldNotCommunicate == false) { - LOG.info("Clearing out PFFE for server " + server.getServerName()); + LOG.info("Clearing out PFFE for server " + server); repeatedFailuresMap.remove(server); } else { // update time of last attempt diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java index 07014e5..d358b9a 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java @@ -84,6 +84,7 @@ public class HBaseClusterManager extends Configured implements ClusterManager { sshOptions = StringUtils.join(new Object[] { sshOptions, extraSshOptions }, " "); } sshOptions = (sshOptions == null) ? "" : sshOptions; + sshUserName = (sshUserName == null) ? "" : sshUserName; tunnelCmd = conf.get("hbase.it.clustermanager.ssh.cmd", DEFAULT_TUNNEL_CMD); // Print out ssh special config if any. if ((sshUserName != null && sshUserName.length() > 0) || diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 7f889ce..fe05d6a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -1390,12 +1390,12 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi */ public boolean isMergeable() { if (!isAvailable()) { - LOG.debug("Region " + getRegionInfo().getRegionNameAsString() + LOG.debug("Region " + this + " is not mergeable because it is closing or closed"); return false; } if (hasReferences()) { - LOG.debug("Region " + getRegionInfo().getRegionNameAsString() + LOG.debug("Region " + this + " is not mergeable because it has references"); return false; } @@ -1559,7 +1559,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi // the close flag? if (!abort && worthPreFlushing() && canFlush) { status.setStatus("Pre-flushing region before close"); - LOG.info("Running close preflush of " + getRegionInfo().getRegionNameAsString()); + LOG.info("Running close preflush of " + this); try { internalFlushcache(status); } catch (IOException ioe) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java index 8aff736..5ff7a1e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java @@ -103,7 +103,7 @@ public class CloseRegionHandler extends EventHandler { // This region got closed. Most likely due to a split. // The split message will clean up the master state. LOG.warn("Can't close region: was already closed during close(): " + - regionInfo.getRegionNameAsString()); + name); return; } } catch (IOException ioe) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java index f41a5cc..564c000 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java @@ -179,7 +179,7 @@ public class MultiThreadedUpdater extends MultiThreadedWriterBase { LOG.info("Null result expected for the rowkey " + Bytes.toString(rowKey)); } else { failedKeySet.add(rowKeyBase); - LOG.error("Failed to update the row with key = [" + rowKey + LOG.error("Failed to update the row with key = [" + Bytes.toString(rowKey) + "], since we could not get the original row"); } } -- 2.9.3 (Apple Git-75)