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

[xucang]

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

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


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

commit 00efac9361499b39ef8f73ec4fb213e54af21fd0
Author: Caroline Zhou <caroline.z...@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 <xuc...@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 40f4aa6..ded0298 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
@@ -1246,7 +1246,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());