From fe1a1094763a8b21c11a9a21ed81df46e5e135e7 Mon Sep 17 00:00:00 2001 From: Christine Poerschke Date: Fri, 12 Apr 2019 16:01:55 +0100 Subject: [PATCH] SOLR-13366: Clarify 'Invalid stage name' warning logging in AutoScalingConfig --- solr/CHANGES.txt | 2 ++ solr/solr-ref-guide/src/solrcloud-autoscaling-listeners.adoc | 2 +- .../solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index a10ea7458cc..16f04323e9f 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -246,6 +246,8 @@ Other Changes * SOLR-12809: Document recommended Java/Solr combinations (Erick Erickson, Jan Høydahl et.al.) +* SOLR-13366: Clarify 'Invalid stage name' warning logging in AutoScalingConfig (Christine Poerschke) + ================== 8.0.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/solr-ref-guide/src/solrcloud-autoscaling-listeners.adoc b/solr/solr-ref-guide/src/solrcloud-autoscaling-listeners.adoc index f3cc02d3227..6e6bfca7715 100644 --- a/solr/solr-ref-guide/src/solrcloud-autoscaling-listeners.adoc +++ b/solr/solr-ref-guide/src/solrcloud-autoscaling-listeners.adoc @@ -155,7 +155,7 @@ trigger named `foo`): { "name" : "foo.system", "trigger" : "solr.SystemLogListener", - "stage" : ["WAITING", "STARTED", "ABORTED", "SUCCEEDED", "FAILED", "BEFORE_ACTION", "AFTER_ACTION"] + "stage" : ["STARTED", "ABORTED", "SUCCEEDED", "FAILED", "BEFORE_ACTION", "AFTER_ACTION"] } ---- diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java index 14cb8844894..366b891e1b3 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java @@ -81,7 +81,8 @@ public class AutoScalingConfig implements MapWriter { TriggerEventProcessorStage stage = TriggerEventProcessorStage.valueOf(String.valueOf(stageName).toUpperCase(Locale.ROOT)); stages.add(stage); } catch (Exception e) { - log.warn("Invalid stage name '" + name + "' in listener config, skipping: " + properties); + log.warn("Invalid stage name '{}' for '{}' in listener config, skipping it in: {}", + stageName, name, properties); } } listenerClass = (String)this.properties.get(AutoScalingParams.CLASS);