Apache Solr open-source search software
SOLR-3696: Fix for LB/Cloud SolrClients that could leak on close() if concurrent request failed and triggered zombie server logic
Chris Hostetter1121d24aff6e
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex fb829a39fb9..89c9ff2a3dc 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -309,6 +309,8 @@ Bug Fixesand then was used to create future clients (via builder.withHttpClient), then redirect processing was wronglydisabled on the shared instance. (David Smiley)+* SOLR-3696: Fix for LB/Cloud SolrClients that could leak on close() if concurrent request failed and triggered zombie server logic. (hossman)+Dependency Upgrades---------------------(No changes)diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.javaindex ebe6a0ed588..85fadde4ac7 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java@@ -86,6 +86,7 @@ public abstract class LBSolrClient extends SolrClient {private volatile EndpointWrapper[] aliveServerList = new EndpointWrapper[0];private volatile ScheduledExecutorService aliveCheckExecutor;+ private volatile boolean isClosed = false;protected long aliveCheckIntervalMillis =TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS); // 1 minute between checks@@ -574,11 +575,16 @@ public abstract class LBSolrClient extends SolrClient {// if it's not null.if (aliveCheckExecutor == null) {synchronized (this) {+ if (isClosed) {+ // must check inside sync block+ return;+ }if (aliveCheckExecutor == null) {log.debug("Starting aliveCheckExecutor for {}", this);aliveCheckExecutor =Executors.newSingleThreadScheduledExecutor(new SolrNamedThreadFactory("aliveCheckExecutor"));+ ObjectReleaseTracker.track(aliveCheckExecutor);aliveCheckExecutor.scheduleAtFixedRate(getAliveCheckRunner(new WeakReference<>(this)),this.aliveCheckIntervalMillis,@@ -825,8 +831,10 @@ public abstract class LBSolrClient extends SolrClient {@Overridepublic void close() {synchronized (this) {+ isClosed = true;if (aliveCheckExecutor != null) {ExecutorUtil.shutdownNowAndAwaitTermination(aliveCheckExecutor);+ ObjectReleaseTracker.release(aliveCheckExecutor);}}ObjectReleaseTracker.release(this);