[lucene-solr] branch jira/solr-14914 updated: SOLR-14914: Don't remove /metrics/history, just disable it.

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch jira/solr-14914
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr-14914 by this push:
     new e4350c0  SOLR-14914: Don't remove /metrics/history, just disable it.
e4350c0 is described below

commit e4350c082d89a324f4279eefc1e8764ea689c240
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Oct 14 17:12:32 2020 +0200

    SOLR-14914: Don't remove /metrics/history, just disable it.
---
 solr/core/src/java/org/apache/solr/core/CoreContainer.java       | 3 ++-
 .../org/apache/solr/handler/admin/MetricsHistoryHandler.java     | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

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 7067bf5..21fb048 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -905,7 +905,8 @@ public class CoreContainer {
   private void createMetricsHistoryHandler() {
     PluginInfo plugin = cfg.getMetricsConfig().getHistoryHandler();
     if (plugin != null && MetricsConfig.NOOP_IMPL_CLASS.equals(plugin.className)) {
-      return;
+      // still create the handler but it will be disabled
+      plugin = null;
     }
     Map<String, Object> initArgs;
     if (plugin != null && plugin.initArgs != null) {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
index 35c89b1..68fb60a 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
@@ -247,6 +247,9 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
 
   // check that .system exists
   public void checkSystemCollection() {
+    if (!enable) {
+      return;
+    }
     if (cloudManager != null) {
       try {
         if (cloudManager.isClosed() || Thread.interrupted()) {
@@ -308,7 +311,9 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
   public void removeHistory(String registry) throws IOException {
     registry = SolrMetricManager.enforcePrefix(registry);
     knownDbs.remove(registry);
-    factory.remove(registry);
+    if (factory != null) {
+      factory.remove(registry);
+    }
   }
 
   @VisibleForTesting
@@ -702,7 +707,7 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
   @Override
   public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
     if (!enable) {
-      rsp.add("error", "metrics collection is disabled");
+      rsp.add("error", "metrics history collection is disabled");
       return;
     }
     String actionStr = req.getParams().get(CommonParams.ACTION);