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 9672318D22 for ; Sat, 30 May 2015 00:44:18 +0000 (UTC) Received: (qmail 69397 invoked by uid 500); 30 May 2015 00:44:18 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 69360 invoked by uid 500); 30 May 2015 00:44:18 -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 69351 invoked by uid 99); 30 May 2015 00:44:18 -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; Sat, 30 May 2015 00:44:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58408E0FB5; Sat, 30 May 2015 00:44:18 +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: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-13810 Table is left unclosed in VerifyReplication#Verifier Date: Sat, 30 May 2015 00:44:18 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1.1 3b2c1a0f9 -> 6c0a4b425 HBASE-13810 Table is left unclosed in VerifyReplication#Verifier Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6c0a4b42 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6c0a4b42 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6c0a4b42 Branch: refs/heads/branch-1.1 Commit: 6c0a4b42595d622e9e49e0a91639c2e76355bd67 Parents: 3b2c1a0 Author: tedyu Authored: Fri May 29 17:44:16 2015 -0700 Committer: tedyu Committed: Fri May 29 17:44:16 2015 -0700 ---------------------------------------------------------------------- .../hbase/mapreduce/replication/VerifyReplication.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6c0a4b42/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java index f94dac9..c91e7b0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java @@ -87,6 +87,7 @@ public class VerifyReplication extends Configured implements Tool { private ResultScanner replicatedScanner; private Result currentCompareRowInPeerTable; + private Table replicatedTable; /** * Map method that compares every scanned row with the equivalent from @@ -127,8 +128,7 @@ public class VerifyReplication extends Configured implements Tool { ZKUtil.applyClusterKeyToConf(peerConf, zkClusterKey); TableName tableName = TableName.valueOf(conf.get(NAME + ".tableName")); - // TODO: THis HTable doesn't get closed. Fix! - Table replicatedTable = new HTable(peerConf, tableName); + replicatedTable = new HTable(peerConf, tableName); scan.setStartRow(value.getRow()); scan.setStopRow(tableSplit.getEndRow()); replicatedScanner = replicatedTable.getScanner(scan); @@ -189,6 +189,14 @@ public class VerifyReplication extends Configured implements Tool { replicatedScanner = null; } } + if (replicatedTable != null) { + TableName tableName = replicatedTable.getName(); + try { + replicatedTable.close(); + } catch (IOException ioe) { + LOG.warn("Exception closing " + tableName, ioe); + } + } } }