Repository: hbase Updated Branches: refs/heads/branch-2 aaafafe63 -> 68bb66e35 refs/heads/branch-2.1 001aabd40 -> acb58284a refs/heads/master f1f2b5a03 -> fdddc47e7
HBASE-21524 Fix logging in ConnectionImplementation.isTableAvailable() Signed-off-by: Michael Stack <st...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/68bb66e3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/68bb66e3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/68bb66e3 Branch: refs/heads/branch-2 Commit: 68bb66e35e1b92cbbfba345b50068dfba557f73e Parents: aaafafe Author: Josh Elser <els...@apache.org> Authored: Wed Nov 28 22:03:55 2018 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Nov 29 11:28:19 2018 -0500 ---------------------------------------------------------------------- .../hbase/client/ConnectionImplementation.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/68bb66e3/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java index 2f35220..f71b839 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java @@ -624,7 +624,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable { checkClosed(); try { if (!isTableEnabled(tableName)) { - LOG.debug("Table " + tableName + " not enabled"); + LOG.debug("Table {} not enabled", tableName); return false; } List<Pair<RegionInfo, ServerName>> locations = @@ -635,10 +635,8 @@ class ConnectionImplementation implements ClusterConnection, Closeable { for (Pair<RegionInfo, ServerName> pair : locations) { RegionInfo info = pair.getFirst(); if (pair.getSecond() == null) { - if (LOG.isDebugEnabled()) { - LOG.debug("Table " + tableName + " has not deployed region " + pair.getFirst() - .getEncodedName()); - } + LOG.debug("Table {} has not deployed region {}", tableName, + pair.getFirst().getEncodedName()); notDeployed++; } else if (splitKeys != null && !Bytes.equals(info.getStartKey(), HConstants.EMPTY_BYTE_ARRAY)) { @@ -656,23 +654,21 @@ class ConnectionImplementation implements ClusterConnection, Closeable { } if (notDeployed > 0) { if (LOG.isDebugEnabled()) { - LOG.debug("Table " + tableName + " has " + notDeployed + " regions"); + LOG.debug("Table {} has {} regions not deployed", tableName, notDeployed); } return false; } else if (splitKeys != null && regionCount != splitKeys.length + 1) { if (LOG.isDebugEnabled()) { - LOG.debug("Table " + tableName + " expected to have " + (splitKeys.length + 1) - + " regions, but only " + regionCount + " available"); + LOG.debug("Table {} expected to have {} regions, but only {} available", tableName, + splitKeys.length + 1, regionCount); } return false; } else { - if (LOG.isDebugEnabled()) { - LOG.debug("Table " + tableName + " should be available"); - } + LOG.trace("Table {} should be available", tableName); return true; } } catch (TableNotFoundException tnfe) { - LOG.warn("Table " + tableName + " not enabled, it is not exists"); + LOG.warn("Table {} does not exist", tableName); return false; } }
