Index: hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java (revision 1553547) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java (working copy) @@ -472,13 +472,17 @@ return; } - for (HRegionInfo region : admin.getTableRegions(tableDesc.getName())) { - try { - sniffRegion(admin, sink, region, table); - } catch (Exception e) { - sink.publishReadFailure(region, e); - LOG.debug("sniffRegion failed", e); + try { + for (HRegionInfo region : admin.getTableRegions(tableDesc.getName())) { + try { + sniffRegion(admin, sink, region, table); + } catch (Exception e) { + sink.publishReadFailure(region, e); + LOG.debug("sniffRegion failed", e); + } } + } finally { + table.close(); } }