Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-18283: Catch and ignore shutdown exceptions. (#4583)

Andrzej Białeckib99be13357cb
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;