From 98e7599462b76677f75e72fe27972c8487a5e929 Mon Sep 17 00:00:00 2001 From: Caroline Zhou Date: Wed, 8 May 2019 13:51:15 -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 71af23ec50..ac03937faa 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> 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()); -- 2.20.1