You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 21:38:31 UTC
[1/2] lucene-solr:branch_5_5: SOLR-9117: The first SolrCore is leaked
after reload (cherry picked from commit d1202a8)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 b76c442bb -> 8fcaa8568
refs/heads/branch_5x 36649beb0 -> 1df6d4f07
SOLR-9117: The first SolrCore is leaked after reload
(cherry picked from commit d1202a8)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8fcaa856
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8fcaa856
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8fcaa856
Branch: refs/heads/branch_5_5
Commit: 8fcaa8568b1e00a12b07e5a5cb396c3da2f65b0e
Parents: b76c442
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed May 18 02:02:30 2016 +0530
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 17:37:26 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/core/CoreContainer.java | 1 -
solr/core/src/java/org/apache/solr/core/SolrCores.java | 11 -----------
3 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fcaa856/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bcc09c4..a671684 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -66,6 +66,8 @@ Bug Fixes
* SOLR-9118: HashQParserPlugin should trim partition keys (Joel Bernstein)
+* SOLR-9117: The first SolrCore is leaked after reload. (Jessica Cheng Mallet via shalin)
+
======================= 5.5.1 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fcaa856/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 67da56d..3bd1f5d 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -812,7 +812,6 @@ public class CoreContainer {
ConfigSet coreConfig = coreConfigService.getConfig(dcore);
log.info("Creating SolrCore '{}' using configuration from {}", dcore.getName(), coreConfig.getName());
core = new SolrCore(dcore, coreConfig);
- solrCores.addCreated(core);
// always kick off recovery if we are in non-Cloud mode
if (!isZooKeeperAware() && core.getUpdateHandler().getUpdateLog() != null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fcaa856/solr/core/src/java/org/apache/solr/core/SolrCores.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCores.java b/solr/core/src/java/org/apache/solr/core/SolrCores.java
index 65b9e21..1d07c14 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCores.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCores.java
@@ -50,8 +50,6 @@ class SolrCores {
private final Map<String, CoreDescriptor> dynamicDescriptors = new LinkedHashMap<>();
- private final Map<String, SolrCore> createdCores = new LinkedHashMap<>();
-
private final CoreContainer container;
private Set<String> currentlyLoadingCores = Collections.newSetFromMap(new ConcurrentHashMap<String,Boolean>());
@@ -215,7 +213,6 @@ class SolrCores {
set.addAll(cores.keySet());
set.addAll(transientCores.keySet());
set.addAll(dynamicDescriptors.keySet());
- set.addAll(createdCores.keySet());
}
return set;
}
@@ -263,8 +260,6 @@ class SolrCores {
// in particular should be checked. It could have been a dynamic core.
tmp = transientCores.remove(name);
ret = (ret == null) ? tmp : ret;
- tmp = createdCores.remove(name);
- ret = (ret == null) ? tmp : ret;
dynamicDescriptors.remove(name);
return ret;
}
@@ -409,12 +404,6 @@ class SolrCores {
return null;
}
- protected void addCreated(SolrCore core) {
- synchronized (modifyLock) {
- createdCores.put(core.getName(), core);
- }
- }
-
/**
* Return the CoreDescriptor corresponding to a given core name.
* Blocks if the SolrCore is still loading until it is ready.
[2/2] lucene-solr:branch_5x: SOLR-9117: The first SolrCore is leaked
after reload (cherry picked from commit d1202a8)
Posted by sa...@apache.org.
SOLR-9117: The first SolrCore is leaked after reload
(cherry picked from commit d1202a8)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1df6d4f0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1df6d4f0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1df6d4f0
Branch: refs/heads/branch_5x
Commit: 1df6d4f078de33ac3f49dd33b09d3ae8c90f5137
Parents: 36649be
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed May 18 02:02:30 2016 +0530
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 17:38:00 2016 -0400
----------------------------------------------------------------------
.../src/java/org/apache/solr/core/CoreContainer.java | 1 -
solr/core/src/java/org/apache/solr/core/SolrCores.java | 11 -----------
2 files changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1df6d4f0/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 5768aff..959dba7 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -815,7 +815,6 @@ public class CoreContainer {
ConfigSet coreConfig = coreConfigService.getConfig(dcore);
log.info("Creating SolrCore '{}' using configuration from {}", dcore.getName(), coreConfig.getName());
core = new SolrCore(dcore, coreConfig);
- solrCores.addCreated(core);
// always kick off recovery if we are in non-Cloud mode
if (!isZooKeeperAware() && core.getUpdateHandler().getUpdateLog() != null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1df6d4f0/solr/core/src/java/org/apache/solr/core/SolrCores.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCores.java b/solr/core/src/java/org/apache/solr/core/SolrCores.java
index 65b9e21..1d07c14 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCores.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCores.java
@@ -50,8 +50,6 @@ class SolrCores {
private final Map<String, CoreDescriptor> dynamicDescriptors = new LinkedHashMap<>();
- private final Map<String, SolrCore> createdCores = new LinkedHashMap<>();
-
private final CoreContainer container;
private Set<String> currentlyLoadingCores = Collections.newSetFromMap(new ConcurrentHashMap<String,Boolean>());
@@ -215,7 +213,6 @@ class SolrCores {
set.addAll(cores.keySet());
set.addAll(transientCores.keySet());
set.addAll(dynamicDescriptors.keySet());
- set.addAll(createdCores.keySet());
}
return set;
}
@@ -263,8 +260,6 @@ class SolrCores {
// in particular should be checked. It could have been a dynamic core.
tmp = transientCores.remove(name);
ret = (ret == null) ? tmp : ret;
- tmp = createdCores.remove(name);
- ret = (ret == null) ? tmp : ret;
dynamicDescriptors.remove(name);
return ret;
}
@@ -409,12 +404,6 @@ class SolrCores {
return null;
}
- protected void addCreated(SolrCore core) {
- synchronized (modifyLock) {
- createdCores.put(core.getName(), core);
- }
- }
-
/**
* Return the CoreDescriptor corresponding to a given core name.
* Blocks if the SolrCore is still loading until it is ready.