Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor logging improvements 

(cherry picked from commit 0ec7986fc0)
This commit is contained in:
Chris Hostetter 2019-09-30 09:58:27 -07:00
parent 494d823e9d
commit 3559e440e0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
View File

@ -490,10 +490,10 @@ public class JettySolrRunner {
Map<String, String> prevContext = MDC.getCopyOfContextMap(); Map<String, String> prevContext = MDC.getCopyOfContextMap();
MDC.clear(); MDC.clear();
log.info("Start Jetty (original configured port={})", this.config.port);
try { try {
int port = reusePort && jettyPort != -1 ? jettyPort : this.config.port; 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 started before, make a new server
if (startedBefore) { if (startedBefore) {

3
solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
View File

@ -149,6 +149,8 @@ public class NodeLostTrigger extends TriggerBase {
Set<String> newLiveNodes = new HashSet<>(cloudManager.getClusterStateProvider().getLiveNodes()); Set<String> newLiveNodes = new HashSet<>(cloudManager.getClusterStateProvider().getLiveNodes());
log.debug("Running NodeLostTrigger: {} with currently live nodes: {} and last live nodes: {}", name, newLiveNodes.size(), lastLiveNodes.size()); 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? // have any nodes that we were tracking been added to the cluster?
// if so, remove them from the tracking map // if so, remove them from the tracking map
@ -191,6 +193,7 @@ public class NodeLostTrigger extends TriggerBase {
log.debug("NodeLostTrigger processor for lost nodes: {} is not ready, will try later", nodeNames); log.debug("NodeLostTrigger processor for lost nodes: {} is not ready, will try later", nodeNames);
} }
} else { } else {
log.debug("NodeLostTrigger firing, but no processor - so removing lost nodes: {}", nodeNames);
nodeNames.forEach(n -> { nodeNames.forEach(n -> {
nodeNameVsTimeRemoved.remove(n); nodeNameVsTimeRemoved.remove(n);
}); });

2
solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
View File

@ -792,7 +792,7 @@ public class MiniSolrCloudCluster {
} }
public void waitForJettyToStop(JettySolrRunner runner) throws TimeoutException { 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); TimeOut timeout = new TimeOut(15, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while(!timeout.hasTimedOut()) { while(!timeout.hasTimedOut()) {
if (runner.isStopped()) { if (runner.isStopped()) {