Return-Path: <commits-return-51074-archive-asf-public=cust-asf.ponee.io@hbase.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 75C53200CBA
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 19 Jun 2017 04:46:55 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 74588160BEE; Mon, 19 Jun 2017 02:46:55 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id BAB39160BE3
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 19 Jun 2017 04:46:54 +0200 (CEST)
Received: (qmail 99917 invoked by uid 500); 19 Jun 2017 02:46:53 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 99908 invoked by uid 99); 19 Jun 2017 02:46:53 -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; Mon, 19 Jun 2017 02:46:53 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 5A1AFDFB94; Mon, 19 Jun 2017 02:46:53 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tedyu@apache.org
To: commits@hbase.apache.org
Message-Id: <b3b9a6cda5884ee1be02123e3097cb8c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hbase git commit: HBASE-18180 Possible connection leak while closing
 BufferedMutator in TableOutputFormat
Date: Mon, 19 Jun 2017 02:46:53 +0000 (UTC)
archived-at: Mon, 19 Jun 2017 02:46:55 -0000

Repository: hbase
Updated Branches:
  refs/heads/master c6e71f159 -> ce1ce728c


HBASE-18180 Possible connection leak while closing BufferedMutator in TableOutputFormat

Signed-off-by: tedyu <yuzhihong@gmail.com>


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

Branch: refs/heads/master
Commit: ce1ce728c6daee9e294bf2915e91faaa73428f3d
Parents: c6e71f1
Author: Pankaj Kumar <pankaj.kr@huawei.com>
Authored: Mon Jun 12 19:51:41 2017 +0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Sun Jun 18 19:46:47 2017 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/mapred/TableOutputFormat.java | 13 ++++++++-----
 .../hadoop/hbase/mapreduce/TableOutputFormat.java     | 14 ++++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/ce1ce728/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
index eb4b66f..8878eee 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
@@ -84,11 +84,14 @@ public class TableOutputFormat extends FileOutputFormat<ImmutableBytesWritable,
     }
 
     public void close(Reporter reporter) throws IOException {
-      if (this.m_mutator != null) {
-        this.m_mutator.close();
-      }
-      if (conn != null) {
-        this.conn.close();
+      try {
+        if (this.m_mutator != null) {
+          this.m_mutator.close();
+        }
+      } finally {
+        if (conn != null) {
+          this.conn.close();
+        }
       }
     }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/ce1ce728/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
index 615999f..5986df8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
@@ -115,10 +115,16 @@ implements Configurable {
      * @see RecordWriter#close(TaskAttemptContext)
      */
     @Override
-    public void close(TaskAttemptContext context)
-    throws IOException {
-      mutator.close();
-      connection.close();
+    public void close(TaskAttemptContext context) throws IOException {
+      try {
+        if (mutator != null) {
+          mutator.close();
+        }
+      } finally {
+        if (connection != null) {
+          connection.close();
+        }
+      }
     }
 
     /**