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 F2A84E1C7 for ; Wed, 27 Feb 2013 18:29:24 +0000 (UTC) Received: (qmail 18863 invoked by uid 500); 27 Feb 2013 18:29:24 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 18823 invoked by uid 500); 27 Feb 2013 18:29:24 -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 18816 invoked by uid 99); 27 Feb 2013 18:29:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Feb 2013 18:29:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Feb 2013 18:29:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 578AC23888EA; Wed, 27 Feb 2013 18:29:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1450901 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver: ReplicationHLogReaderManager.java ReplicationSource.java Date: Wed, 27 Feb 2013 18:29:02 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130227182902.578AC23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tedyu Date: Wed Feb 27 18:29:01 2013 New Revision: 1450901 URL: http://svn.apache.org/r1450901 Log: HBASE-7944 Replication leaks file reader resource & not reset currentNbOperations (Jeffrey Zhong) Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java?rev=1450901&r1=1450900&r2=1450901&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java Wed Feb 27 18:29:01 2013 @@ -123,15 +123,20 @@ public class ReplicationHLogReaderManage public void closeReader() throws IOException { if (this.reader != null) { this.reader.close(); + this.reader = null; } } /** * Tell the helper to reset internal state */ - public void finishCurrentFile() { + void finishCurrentFile() { this.position = 0; - this.reader = null; + try { + this.closeReader(); + } catch (IOException e) { + LOG.warn("Unable to close reader", e); + } } } Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java?rev=1450901&r1=1450900&r2=1450901&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java Wed Feb 27 18:29:01 2013 @@ -327,6 +327,7 @@ public class ReplicationSource extends T } boolean gotIOE = false; + currentNbOperations = 0; currentNbEntries = 0; currentSize = 0; try {