From 0ec7986fc01d91ae063c8ade170f06890d0bad50 Mon Sep 17 00:00:00 2001 From: Chris Hostetter Date: Mon, 30 Sep 2019 09:58:27 -0700 Subject: [PATCH] Minor logging improvements --- .../apache/solr/client/solrj/embedded/JettySolrRunner.java | 4 ++-- .../org/apache/solr/cloud/autoscaling/NodeLostTrigger.java | 5 ++++- .../src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java index c98bbb427e5..0e52c35cb39 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java @@ -490,10 +490,10 @@ public class JettySolrRunner { Map prevContext = MDC.getCopyOfContextMap(); MDC.clear(); - log.info("Start Jetty (original configured port={})", this.config.port); - try { int port = reusePort && jettyPort != -1 ? jettyPort : this.config.port; + log.info("Start Jetty (configured port={}, binding port={})", this.config.port, port); + // if started before, make a new server if (startedBefore) { diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java index 047db9061e8..1e44afb4cf1 100644 --- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java +++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java @@ -149,7 +149,9 @@ public class NodeLostTrigger extends TriggerBase { Set newLiveNodes = new HashSet<>(cloudManager.getClusterStateProvider().getLiveNodes()); log.debug("Running NodeLostTrigger: {} with currently live nodes: {} and last live nodes: {}", name, newLiveNodes.size(), lastLiveNodes.size()); - + log.trace("Current Live Nodes for {}: {}", name, newLiveNodes); + log.trace("Last Live Nodes for {}: {}", name, lastLiveNodes); + // have any nodes that we were tracking been added to the cluster? // if so, remove them from the tracking map Set trackingKeySet = nodeNameVsTimeRemoved.keySet(); @@ -191,6 +193,7 @@ public class NodeLostTrigger extends TriggerBase { log.debug("NodeLostTrigger processor for lost nodes: {} is not ready, will try later", nodeNames); } } else { + log.debug("NodeLostTrigger firing, but no processor - so removing lost nodes: {}", nodeNames); nodeNames.forEach(n -> { nodeNameVsTimeRemoved.remove(n); }); diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java index 7c6d120e1d4..fbb547c9796 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java @@ -792,7 +792,7 @@ public class MiniSolrCloudCluster { } public void waitForJettyToStop(JettySolrRunner runner) throws TimeoutException { - log.info("waitForJettyToStop: {}", runner.getNodeName()); + log.info("waitForJettyToStop: {}", runner.getLocalPort()); TimeOut timeout = new TimeOut(15, TimeUnit.SECONDS, TimeSource.NANO_TIME); while(!timeout.hasTimedOut()) { if (runner.isStopped()) {