You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2019/12/11 01:26:16 UTC
[lucene-solr] branch branch_8x updated: SOLR-13953: Prometheus
exporter in SolrCloud mode limited to 100 nodes
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new dda88f7 SOLR-13953: Prometheus exporter in SolrCloud mode limited to 100 nodes
dda88f7 is described below
commit dda88f73bbecee093a088ab25b2290b2698060f1
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Tue Dec 10 20:19:30 2019 -0500
SOLR-13953: Prometheus exporter in SolrCloud mode limited to 100 nodes
(cherry picked from commit d189520935cab36ae4d86f3822b38348f464d960)
---
solr/CHANGES.txt | 5 ++++-
.../java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java | 7 +------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d3580c8..195118a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -48,7 +48,6 @@ Upgrade Notes
New Features
---------------------
-
* SOLR-13821: A Package store to store and load package artifacts (noble, Ishan Chattopadhyaya)
* SOLR-13822: A Package management system with the following features:
@@ -158,6 +157,10 @@ Bug Fixes
* SOLR-13806: SolrJ QueryResponse._explainMap is incorrectly typed. (Guna Sekhar Dorai, ab)
+* SOLR-13975, SOLR-13896: ConcurrentUpdateSolrClient connection stall prevention. (ab, caomanhdat)
+
+* SOLR-13953: Prometheus exporter in SolrCloud mode limited to 100 nodes (Alex Jablonski via Erick Erickson)
+
Other Changes
---------------------
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java
index 2652e5e..896ea27 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.RemovalListener;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.common.cloud.DocCollection;
@@ -43,11 +42,7 @@ public class SolrCloudScraper extends SolrScraper {
private final CloudSolrClient solrClient;
private final SolrClientFactory solrClientFactory;
- private Cache<String, HttpSolrClient> hostClientCache = CacheBuilder.newBuilder()
- .maximumSize(100)
- .removalListener((RemovalListener<String, HttpSolrClient>)
- removalNotification -> IOUtils.closeQuietly(removalNotification.getValue()))
- .build();
+ private Cache<String, HttpSolrClient> hostClientCache = CacheBuilder.newBuilder().build();
public SolrCloudScraper(CloudSolrClient solrClient, Executor executor, SolrClientFactory solrClientFactory) {
super(executor);