(solr) branch branch_10x updated: SOLR-18283: Catch and ignore shutdown exceptions (cherry-pick from #4583)

[ab]

This is an automated email from the ASF dual-hosted git repository.

sigram pushed a commit to branch branch_10x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_10x by this push:
     new 7dbb35e57da SOLR-18283: Catch and ignore shutdown exceptions 
(cherry-pick from #4583)
7dbb35e57da is described below

commit 7dbb35e57dab14c0d090f959cea4004240901bea
Author: Andrzej Białecki <a...@apache.org>
AuthorDate: Wed Jul 1 19:03:54 2026 +0200

    SOLR-18283: Catch and ignore shutdown exceptions (cherry-pick from #4583)
---
 .../solr/crossdc/manager/SolrAndKafkaReindexTest.java    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git 
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaReindexTest.java
 
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaReindexTest.java
index 4c64a6a491f..a7c12207e57 100644
--- 
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaReindexTest.java
+++ 
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaReindexTest.java
@@ -130,12 +130,18 @@ public class SolrAndKafkaReindexTest extends 
SolrCloudTestCase {
     ObjectReleaseTracker.clear();
 
     if (solrCluster1 != null) {
-      solrCluster1.getZkServer().getZkClient().printLayoutToStream(System.out);
-      solrCluster1.shutdown();
+      try {
+        solrCluster1.shutdown();
+      } catch (Exception e) {
+        log.error("Exception shutting down solrCluster1, ignoring.", e);
+      }
     }
     if (solrCluster2 != null) {
-      solrCluster2.getZkServer().getZkClient().printLayoutToStream(System.out);
-      solrCluster2.shutdown();
+      try {
+        solrCluster2.shutdown();
+      } catch (Exception e) {
+        log.error("Exception shutting down solrCluster2, ignoring.", e);
+      }
     }
 
     if (consumer != null) {
@@ -147,7 +153,7 @@ public class SolrAndKafkaReindexTest extends 
SolrCloudTestCase {
         kafkaCluster.stop();
       }
     } catch (Exception e) {
-      log.error("Exception stopping Kafka cluster", e);
+      log.error("Exception stopping Kafka cluster, ignoring", e);
     }
 
     solrCluster1 = null;