Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-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 2B26E182FC for ; Tue, 23 Feb 2016 18:16:20 +0000 (UTC) Received: (qmail 61386 invoked by uid 500); 23 Feb 2016 18:16:04 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 61374 invoked by uid 99); 23 Feb 2016 18:16:04 -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, 23 Feb 2016 18:16:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0FF70E8E7F; Tue, 23 Feb 2016 18:16:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: markrmiller@apache.org To: commits@lucene.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr git commit: SOLR-8497: Merge indexes should mark it's directories as done rather than keep them around in the directory cache. Date: Tue, 23 Feb 2016 18:16:04 +0000 (UTC) Repository: lucene-solr Updated Branches: refs/heads/master 54216c6f6 -> 7d32456ef SOLR-8497: Merge indexes should mark it's directories as done rather than keep them around in the directory cache. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7d32456e Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7d32456e Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7d32456e Branch: refs/heads/master Commit: 7d32456efa4ade0130c3ed0ae677aa47b29355a9 Parents: 54216c6 Author: markrmiller Authored: Tue Feb 23 13:15:01 2016 -0500 Committer: markrmiller Committed: Tue Feb 23 13:15:01 2016 -0500 ---------------------------------------------------------------------- solr/CHANGES.txt | 3 +++ .../java/org/apache/solr/handler/admin/CoreAdminOperation.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7d32456e/solr/CHANGES.txt ---------------------------------------------------------------------- diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 65820f1..3afc961 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -211,6 +211,9 @@ Bug Fixes * SOLR-8599: After a failed connection during construction of SolrZkClient attempt to retry until a connection can be made. (Keith Laban, Dennis Gove) + +* SOLR-8497: Merge index does not mark the Directory objects it creates as 'done' and they are retained in the + Directory cache. (Sivlio Sanchez, Mark Miller) Optimizations ---------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7d32456e/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java index 8641470..094a46c 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java @@ -297,6 +297,7 @@ enum CoreAdminOperation { IOUtils.closeWhileHandlingException(readersToBeClosed); for (Directory dir : dirsToBeReleased) { DirectoryFactory dirFactory = core.getDirectoryFactory(); + dirFactory.doneWithDirectory(dir); dirFactory.release(dir); } if (wrappedReq != null) wrappedReq.close();