hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject hbase git commit: HBASE-13833 LoadIncrementalHFile.doBulkLoad(Path, HTable) doesn't handle unmanaged connections when using SecureBulkLoad
Date Mon, 15 Jun 2015 19:25:43 GMT
Repository: hbase
Updated Branches:
  refs/heads/master d28f29980 -> 461f5307b


HBASE-13833 LoadIncrementalHFile.doBulkLoad(Path,HTable) doesn't handle unmanaged connections
when using SecureBulkLoad


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/461f5307
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/461f5307
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/461f5307

Branch: refs/heads/master
Commit: 461f5307ba999d73e3f0e0110faf045a5ebe5dfc
Parents: d28f299
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Sun Jun 14 13:15:41 2015 -0700
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Mon Jun 15 12:10:23 2015 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/461f5307/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
----------------------------------------------------------------------
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);
+    }
   }
 
   /**


Mime
View raw message