You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2025/03/22 16:15:59 UTC
(solr) branch main updated: Test fix: SolrExporterTestBase, port bind (#3269)
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 5b272b7188b Test fix: SolrExporterTestBase, port bind (#3269)
5b272b7188b is described below
commit 5b272b7188b132621032dc7ffda2f7346d1eeea5
Author: David Smiley <ds...@apache.org>
AuthorDate: Sat Mar 22 12:15:53 2025 -0400
Test fix: SolrExporterTestBase, port bind (#3269)
Co-authored-by: Paul McArthur <pm...@salesforce.com>
---
.../solr/prometheus/exporter/SolrExporter.java | 4 +-
.../prometheus/exporter/SolrExporterTestBase.java | 44 ++++++++++++++++------
2 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
index ebcff4e87a6..d227a8b3b54 100644
--- a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
+++ b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
@@ -102,7 +102,9 @@ public class SolrExporter {
}
void stop() {
- httpServer.stop();
+ if (httpServer != null) {
+ httpServer.stop();
+ }
metricsCollector.removeObserver(prometheusCollector);
diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
index 46b7c45e538..70061fa914f 100644
--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
@@ -20,6 +20,8 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.lang.invoke.MethodHandles;
+import java.net.BindException;
import java.net.ServerSocket;
import java.net.URI;
import java.net.URISyntaxException;
@@ -36,11 +38,15 @@ import org.apache.solr.common.util.Pair;
import org.apache.solr.prometheus.PrometheusExporterTestBase;
import org.apache.solr.prometheus.utils.Helpers;
import org.junit.After;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** Test base class. */
@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
public class SolrExporterTestBase extends PrometheusExporterTestBase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private SolrExporter solrExporter;
private CloseableHttpClient httpClient;
private int promtheusExporterPort;
@@ -57,20 +63,34 @@ public class SolrExporterTestBase extends PrometheusExporterTestBase {
protected void startMetricsExporterWithConfiguration(String scrapeConfiguration)
throws Exception {
- try (ServerSocket socket = new ServerSocket(0)) {
- promtheusExporterPort = socket.getLocalPort();
- }
- solrExporter =
- new SolrExporter(
- promtheusExporterPort,
- 25,
- 10,
- SolrScrapeConfiguration.solrCloud(cluster.getZkServer().getZkAddress()),
- Helpers.loadConfiguration(scrapeConfiguration),
- "test");
+ final int maxAttempts = 3;
+ for (int attempt = 1; attempt <= maxAttempts; attempt++) {
+ try (ServerSocket socket = new ServerSocket(0)) {
+ promtheusExporterPort = socket.getLocalPort();
+ }
+
+ try {
+ solrExporter =
+ new SolrExporter(
+ promtheusExporterPort,
+ 25,
+ 10,
+ SolrScrapeConfiguration.solrCloud(cluster.getZkServer().getZkAddress()),
+ Helpers.loadConfiguration(scrapeConfiguration),
+ "test");
+
+ solrExporter.start();
+ break;
+ } catch (BindException e) {
+ solrExporter.stop();
+ if (attempt == maxAttempts) {
+ throw e;
+ }
+ log.warn("Failed to start exporter with port bind exception, retrying on a new port");
+ }
+ }
- solrExporter.start();
httpClient = HttpClients.createDefault();
for (int i = 0; i < 50; ++i) {