Apache Solr open-source search software
SOLR-3696: LBSolrClient use ObjectReleaseTracker (#2695)
David Smiley7063334fd00f
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 a59efe7bc46..795f2a003cb 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@@ -57,6 +57,7 @@ import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.NamedList;+import org.apache.solr.common.util.ObjectReleaseTracker;import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.common.util.URLUtil;import org.slf4j.MDC;@@ -403,6 +404,7 @@ public abstract class LBSolrClient extends SolrClient {}updateAliveList();}+ ObjectReleaseTracker.track(this);}protected void updateAliveList() {@@ -793,5 +795,6 @@ public abstract class LBSolrClient extends SolrClient {ExecutorUtil.shutdownAndAwaitTermination(aliveCheckExecutor);}}+ ObjectReleaseTracker.release(this);}}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.javaindex 2c654248a4d..078812f0600 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java@@ -119,31 +119,30 @@ public class HttpSolrClientConPoolTest extends SolrJettyTestBase {ExecutorUtil.newMDCAwareFixedThreadPool(threadCount, new SolrNamedThreadFactory(getClass().getSimpleName() + "TestScheduler"));CloseableHttpClient httpClient = HttpClientUtil.createClient(new ModifiableSolrParams(), pool);- try {- final LBHttpSolrClient roundRobin =- new LBHttpSolrClient.Builder()- .withBaseEndpoint(fooUrl)- .withBaseEndpoint(barUrl)- .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)- .withHttpClient(httpClient)- .build();-- List<ConcurrentUpdateSolrClient> concurrentClients =- Arrays.asList(- new ConcurrentUpdateSolrClient.Builder(fooUrl)- .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)- .withHttpClient(httpClient)- .withThreadCount(threadCount)- .withQueueSize(10)- .withExecutorService(threads)- .build(),- new ConcurrentUpdateSolrClient.Builder(barUrl)- .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)- .withHttpClient(httpClient)- .withThreadCount(threadCount)- .withQueueSize(10)- .withExecutorService(threads)- .build());+ try (var roundRobin =+ new LBHttpSolrClient.Builder()+ .withBaseEndpoint(fooUrl)+ .withBaseEndpoint(barUrl)+ .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)+ .withHttpClient(httpClient)+ .build();+ final var fooClient =+ new ConcurrentUpdateSolrClient.Builder(fooUrl)+ .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)+ .withHttpClient(httpClient)+ .withThreadCount(threadCount)+ .withQueueSize(10)+ .withExecutorService(threads)+ .build();+ final var barClient =+ new ConcurrentUpdateSolrClient.Builder(barUrl)+ .withDefaultCollection(DEFAULT_TEST_COLLECTION_NAME)+ .withHttpClient(httpClient)+ .withThreadCount(threadCount)+ .withQueueSize(10)+ .withExecutorService(threads)+ .build()) {+ List<ConcurrentUpdateSolrClient> concurrentClients = Arrays.asList(fooClient, barClient);for (int i = 0; i < 2; i++) {roundRobin.deleteByQuery("*:*");