Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 69F07172FF for ; Tue, 15 Sep 2015 18:06:11 +0000 (UTC) Received: (qmail 53971 invoked by uid 500); 15 Sep 2015 18:05:55 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 53936 invoked by uid 500); 15 Sep 2015 18:05:55 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 53927 invoked by uid 99); 15 Sep 2015 18:05:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Sep 2015 18:05:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 450A6DFDD7; Tue, 15 Sep 2015 18:05:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ssrungarapu@apache.org To: commits@hbase.apache.org Message-Id: <227769761ef74938a57a47b6f1e21462@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-14394 Properly close the connection after reading records from table. Date: Tue, 15 Sep 2015 18:05:55 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master f51c79076 -> 938d2a0c9 HBASE-14394 Properly close the connection after reading records from table. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/938d2a0c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/938d2a0c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/938d2a0c Branch: refs/heads/master Commit: 938d2a0c9cfa4c033ccc72de490672f151bb0351 Parents: f51c790 Author: Srikanth Srungarapu Authored: Tue Sep 15 11:02:00 2015 -0700 Committer: Srikanth Srungarapu Committed: Tue Sep 15 11:02:00 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/mapreduce/MultiTableInputFormatBase.java | 3 +-- .../apache/hadoop/hbase/mapreduce/TableRecordReader.java | 10 +++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/938d2a0c/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java index f4a3eb1..83dca4b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java @@ -107,11 +107,10 @@ public abstract class MultiTableInputFormatBase extends sc.setStopRow(tSplit.getEndRow()); trr.setScan(sc); trr.setTable(table); + trr.setConnection(connection); } catch (IOException ioe) { // If there is an exception make sure that all // resources are closed and released. - connection.close(); - table.close(); trr.close(); throw ioe; } http://git-wip-us.apache.org/repos/asf/hbase/blob/938d2a0c/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java index f46f1e3..9ff90e7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReader.java @@ -22,6 +22,7 @@ import java.io.IOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; @@ -40,6 +41,7 @@ public class TableRecordReader extends RecordReader { private TableRecordReaderImpl recordReaderImpl = new TableRecordReaderImpl(); + private Connection connection = null; /** * Restart from survivable exceptions by creating a new scanner. @@ -85,8 +87,10 @@ extends RecordReader { * @see org.apache.hadoop.mapreduce.RecordReader#close() */ @Override - public void close() { + public void close() throws IOException { this.recordReaderImpl.close(); + if (this.connection != null) + this.connection.close(); } /** @@ -157,4 +161,8 @@ extends RecordReader { public float getProgress() { return this.recordReaderImpl.getProgress(); } + + public void setConnection(Connection connection) { + this.connection = connection; + } }