From 10e80cfa1a1891ac32e0406f9b4dc951442fce6e Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Wed, 28 Nov 2018 22:03:55 -0500 Subject: [PATCH] HBASE-21524 Fix logging in ConnectionImplementation.isTableAvailable() --- .../client/ConnectionImplementation.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) 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 2b0f4c7be6..a5ef9e5dd1 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 @@ -611,7 +611,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> locations = @@ -622,10 +622,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable { for (Pair 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)) { @@ -643,23 +640,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; } } -- 2.18.0