You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/03/15 12:40:07 UTC
lucene-solr:jira/solr-9959: SOLR-9959 Remove back-compat JMX view.
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-9959 8d913328f -> feb7deca6
SOLR-9959 Remove back-compat JMX view.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/feb7deca
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/feb7deca
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/feb7deca
Branch: refs/heads/jira/solr-9959
Commit: feb7deca6925470736855a514f17a416fcc143f3
Parents: 8d91332
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Mar 15 13:19:51 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Mar 15 13:19:51 2017 +0100
----------------------------------------------------------------------
.../org/apache/solr/core/JmxMonitoredMap.java | 28 ++------------------
.../apache/solr/search/SolrFieldCacheMBean.java | 3 ---
2 files changed, 2 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/feb7deca/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java b/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
index 8bfa662..c7133e1 100644
--- a/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
+++ b/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
@@ -190,15 +190,9 @@ public class JmxMonitoredMap<K, V> extends
public SolrInfoMBean put(String key, SolrInfoMBean infoBean) {
if (server != null && infoBean != null) {
try {
- // back-compat name
- ObjectName name = getObjectName(key, infoBean);
- if (server.isRegistered(name))
- server.unregisterMBean(name);
SolrDynamicMBean mbean = new SolrDynamicMBean(coreHashCode, infoBean, useCachedStatsBetweenGetMBeanInfoCalls);
- server.registerMBean(mbean, name);
- // now register it also under new name
String beanName = createBeanName(infoBean, key);
- name = nameFactory.createName(null, registryName, beanName);
+ ObjectName name = nameFactory.createName(null, registryName, beanName);
if (server.isRegistered(name))
server.unregisterMBean(name);
server.registerMBean(mbean, name);
@@ -247,14 +241,8 @@ public class JmxMonitoredMap<K, V> extends
return;
try {
- // remove legacy name
- ObjectName name = getObjectName(key, infoBean);
- if (server.isRegistered(name) && coreHashCode.equals(server.getAttribute(name, "coreHashCode"))) {
- server.unregisterMBean(name);
- }
- // remove new name
String beanName = createBeanName(infoBean, key);
- name = nameFactory.createName(null, registryName, beanName);
+ ObjectName name = nameFactory.createName(null, registryName, beanName);
if (server.isRegistered(name)) {
server.unregisterMBean(name);
}
@@ -264,16 +252,6 @@ public class JmxMonitoredMap<K, V> extends
}
}
- private ObjectName getObjectName(String key, SolrInfoMBean infoBean)
- throws MalformedObjectNameException {
- Hashtable<String, String> map = new Hashtable<>();
- map.put("type", key);
- if (infoBean.getName() != null && !"".equals(infoBean.getName())) {
- map.put("id", infoBean.getName());
- }
- return ObjectName.getInstance(jmxRootName, map);
- }
-
/** For test verification */
public MBeanServer getServer() {
return server;
@@ -313,10 +291,8 @@ public class JmxMonitoredMap<K, V> extends
// For which getters are already available in SolrInfoMBean
staticStats.add(NAME);
- staticStats.add("version");
staticStats.add("description");
staticStats.add("category");
- staticStats.add("source");
this.coreHashCode = coreHashCode;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/feb7deca/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
index 45f408c..7d387fe 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
@@ -16,12 +16,9 @@
*/
package org.apache.solr.search;
-import java.net.URL;
-
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.JmxMonitoredMap.JmxAugmentedSolrInfoMBean;
-import org.apache.solr.core.SolrCore;
import org.apache.solr.uninverting.UninvertingReader;
/**