From d32d08162ce4adde322ca72338426f8a9a7d2851 Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Sun, 14 Jun 2015 13:15:41 -0700 Subject: [PATCH] HBASE-13833 LoadIncrementalHFile.doBulkLoad(Path,HTable) doesn't handle unmanaged connections when using SecureBulkLoad --- .../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java index 40601d6..8b74e4e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java @@ -287,7 +287,10 @@ public class LoadIncrementalHFiles extends Configured implements Tool { @SuppressWarnings("deprecation") public void doBulkLoad(Path hfofDir, final HTable table) throws TableNotFoundException, IOException { - doBulkLoad(hfofDir, table.getConnection().getAdmin(), table, table.getRegionLocator()); + try (Admin admin = table.getConnection().getAdmin(); + RegionLocator rl = table.getRegionLocator()) { + doBulkLoad(hfofDir, admin, table, rl); + } } /** -- 1.9.5 (Apple Git-50.3)