Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 B0521172EF for ; Thu, 6 Nov 2014 18:53:00 +0000 (UTC) Received: (qmail 16231 invoked by uid 500); 6 Nov 2014 18:53:00 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 16129 invoked by uid 500); 6 Nov 2014 18:53:00 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 16113 invoked by uid 99); 6 Nov 2014 18:53:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2014 18:53:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1965E8BC747; Thu, 6 Nov 2014 18:53:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Thu, 06 Nov 2014 18:53:00 -0000 Message-Id: In-Reply-To: <93e522bc64514993b13c47592d22a8fd@git.apache.org> References: <93e522bc64514993b13c47592d22a8fd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] accumulo git commit: ACCUMULO-3297 merge 1.6 to master ACCUMULO-3297 merge 1.6 to master Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc48e37d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc48e37d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cc48e37d Branch: refs/heads/master Commit: cc48e37dd0ed7e4a0e0f058641d3949745f4f9b3 Parents: ce37a67 c85bf4f Author: Eric C. Newton Authored: Thu Nov 6 13:52:36 2014 -0500 Committer: Eric C. Newton Committed: Thu Nov 6 13:52:36 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/tserver/FileManager.java | 35 +++--- .../apache/accumulo/test/MetaGetsReadersIT.java | 114 +++++++++++++++++++ 2 files changed, 135 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc48e37d/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java ---------------------------------------------------------------------- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java index 8d5335a,1735aec..fb14ca5 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java @@@ -522,9 -529,9 +529,9 @@@ public class FileManager return iters; } - synchronized void detach() { + public synchronized void detach() { - releaseReaders(tabletReservedReaders, false); + releaseReaders(tablet, tabletReservedReaders, false); tabletReservedReaders.clear(); for (FileDataSource fds : dataSources) @@@ -558,8 -565,8 +565,8 @@@ } } - synchronized void releaseOpenFiles(boolean sawIOException) { + public synchronized void releaseOpenFiles(boolean sawIOException) { - releaseReaders(tabletReservedReaders, sawIOException); + releaseReaders(tablet, tabletReservedReaders, sawIOException); tabletReservedReaders.clear(); dataSources.clear(); }