You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/11/04 16:21:13 UTC
svn commit: r1636603 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/JmxMonitoredMap.java
core/src/java/org/apache/solr/core/SolrCore.java
Author: shalin
Date: Tue Nov 4 15:21:12 2014
New Revision: 1636603
URL: http://svn.apache.org/r1636603
Log:
SOLR-2927: Solr does not unregister all mbeans upon exception in constructor causing memory leaks
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1636603&r1=1636602&r2=1636603&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Nov 4 15:21:12 2014
@@ -284,6 +284,8 @@ Bug Fixes
* SOLR-6631: DistributedQueue spinning on calling zookeeper getChildren()
(Jessica Cheng Mallet, Mark Miller, Timothy Potter)
+* SOLR-2927: Solr does not unregister all mbeans upon exception in constructor
+ causing memory leaks. (tom liu, Sharath Babu, Cyrille Roy, shalin)
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java?rev=1636603&r1=1636602&r2=1636603&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java Tue Nov 4 15:21:12 2014
@@ -112,8 +112,16 @@ public class JmxMonitoredMap<K, V> exten
@Override
public void clear() {
if (server != null) {
- for (Map.Entry<String, SolrInfoMBean> entry : entrySet()) {
- unregister(entry.getKey(), entry.getValue());
+ QueryExp exp = Query.eq(Query.attr("coreHashCode"), Query.value(coreHashCode));
+ Set<ObjectName> objectNames = server.queryNames(null, exp);
+ if (objectNames != null) {
+ for (ObjectName name : objectNames) {
+ try {
+ server.unregisterMBean(name);
+ } catch (Exception e) {
+ LOG.error("Exception un-registering mbean {}", name, e);
+ }
+ }
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1636603&r1=1636602&r2=1636603&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Tue Nov 4 15:21:12 2014
@@ -1065,14 +1065,6 @@ public final class SolrCore implements S
}
- try {
- infoRegistry.clear();
- } catch (Throwable e) {
- SolrException.log(log, e);
- if (e instanceof Error) {
- throw (Error) e;
- }
- }
try {
if (null != updateHandler) {
@@ -1125,6 +1117,15 @@ public final class SolrCore implements S
throw (Error) e;
}
}
+
+ try {
+ infoRegistry.clear();
+ } catch (Throwable e) {
+ SolrException.log(log, e);
+ if (e instanceof Error) {
+ throw (Error) e;
+ }
+ }
if (coreStateClosed) {