[hbase] branch branch-1.3 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-1.3
in repository https://gitbox.apache.org/repos/asf/hbase.git


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

commit 342cca4c8c607a8699c671853694bf60cecb07fd
Author: Caroline Zhou <caroline.z...@salesforce.com>
AuthorDate: Wed May 8 13:21:05 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 081ef90..c0655d8 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
@@ -1174,7 +1174,7 @@ public final class Canary implements Tool {
       }
       List<Future<Void>> taskFutures = new LinkedList<>();
       for (HTableDescriptor table : admin.listTables()) {
-        if (admin.isTableEnabled(table.getTableName())
+        if (admin.tableExists(table.getTableName()) && 
admin.isTableEnabled(table.getTableName())
             && (!table.getTableName().equals(writeTableName))) {
           AtomicLong readLatency = 
regionSink.initializeAndGetReadLatencyForTable(table.getNameAsString());
           taskFutures.addAll(Canary.sniff(admin, sink, table, executor, 
taskType, this.rawScanEnabled, readLatency));