[hbase] branch branch-2 updated: HBASE-22378. HBase Canary fails with TableNotFoundException when table deleted during Canary run

[xu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xucang pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new e4c4433  HBASE-22378. HBase Canary fails with TableNotFoundException when table deleted during Canary run
e4c4433 is described below

commit e4c4433787eff3d157e7243ab3c974efe2ed7a4a
Author: Caroline Zhou <ca...@salesforce.com>
AuthorDate: Wed May 8 13:51:15 2019 -0700

    HBASE-22378. HBase Canary fails with TableNotFoundException when table deleted during Canary run
    
    Signed-off-by: Xu Cang <xu...@apache.org>
---
 hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
index 71af23e..ac03937 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
@@ -1245,7 +1245,7 @@ public final class Canary implements Tool {
       LOG.debug("Reading list of tables");
       List<Future<Void>> taskFutures = new LinkedList<>();
       for (TableDescriptor td: admin.listTableDescriptors()) {
-        if (admin.isTableEnabled(td.getTableName()) &&
+        if (admin.tableExists(td.getTableName()) && admin.isTableEnabled(td.getTableName()) &&
             (!td.getTableName().equals(writeTableName))) {
           LongAdder readLatency =
               regionSink.initializeAndGetReadLatencyForTable(td.getTableName().getNameAsString());