From 28c9ea506ca58934b4c135998b688d539a921dee Mon Sep 17 00:00:00 2001 From: Caroline Zhou Date: Wed, 8 May 2019 13:21:05 -0700 Subject: [PATCH] HBASE-22378. HBase Canary fails with TableNotFoundException when table deleted during Canary run --- .../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 e2d59193f2..073df68583 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 @@ -1175,7 +1175,7 @@ public final class Canary implements Tool { } List> 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)); -- 2.20.1