This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new bce9c907a17 SOLR-17065: Fix Locale issues with Kafka tests
bce9c907a17 is described below
commit bce9c907a170752cd0822d7777f2921fe2871817
Author: Houston Putman <[email protected]>
AuthorDate: Tue Oct 1 12:11:45 2024 -0500
SOLR-17065: Fix Locale issues with Kafka tests
(cherry picked from commit 383d21bac694d17ae64ddae5af30cfb9b5a0c615)
---
.../solr/crossdc/manager/DeleteByQueryToIdTest.java | 9 +++++++--
.../crossdc/manager/RetryQueueIntegrationTest.java | 9 +++++++--
.../crossdc/manager/SolrAndKafkaIntegrationTest.java | 13 +++++++++++++
.../SolrAndKafkaMultiCollectionIntegrationTest.java | 6 ++++++
.../crossdc/manager/SolrAndKafkaReindexTest.java | 6 +++++-
.../crossdc/manager/ZkConfigIntegrationTest.java | 20 ++++++++++++++------
6 files changed, 52 insertions(+), 11 deletions(-)
diff --git
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/DeleteByQueryToIdTest.java
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/DeleteByQueryToIdTest.java
index 998e04fbc4f..ff13f34e301 100644
---
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/DeleteByQueryToIdTest.java
+++
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/DeleteByQueryToIdTest.java
@@ -85,6 +85,7 @@ public class DeleteByQueryToIdTest extends SolrCloudTestCase {
@BeforeClass
public static void beforeSolrAndKafkaIntegrationTest() throws Exception {
+ SolrAndKafkaIntegrationTest.ensureCompatibleLocale();
System.setProperty(KafkaCrossDcConf.PORT, "-1");
consumer = new Consumer();
@@ -183,10 +184,14 @@ public class DeleteByQueryToIdTest extends
SolrCloudTestCase {
public static void afterSolrAndKafkaIntegrationTest() throws Exception {
ObjectReleaseTracker.clear();
- consumer.shutdown();
+ if (consumer != null) {
+ consumer.shutdown();
+ }
try {
- kafkaCluster.stop();
+ if (kafkaCluster != null) {
+ kafkaCluster.stop();
+ }
} catch (Exception e) {
log.error("Exception stopping Kafka cluster", e);
}
diff --git
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/RetryQueueIntegrationTest.java
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/RetryQueueIntegrationTest.java
index 891ff362fb5..147a7673df7 100644
---
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/RetryQueueIntegrationTest.java
+++
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/RetryQueueIntegrationTest.java
@@ -80,6 +80,7 @@ public class RetryQueueIntegrationTest extends SolrTestCaseJ4
{
@BeforeClass
public static void beforeRetryQueueIntegrationTestTest() throws Exception {
+ SolrAndKafkaIntegrationTest.ensureCompatibleLocale();
System.setProperty(KafkaCrossDcConf.PORT, "-1");
consumer = new Consumer();
@@ -169,10 +170,14 @@ public class RetryQueueIntegrationTest extends
SolrTestCaseJ4 {
public static void afterRetryQueueIntegrationTest() throws Exception {
ObjectReleaseTracker.clear();
- consumer.shutdown();
+ if (consumer != null) {
+ consumer.shutdown();
+ }
try {
- kafkaCluster.stop();
+ if (kafkaCluster != null) {
+ kafkaCluster.stop();
+ }
} catch (Exception e) {
log.error("Exception stopping Kafka cluster", e);
}
diff --git
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java
index 068f2100379..af65035258e 100644
---
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java
+++
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java
@@ -27,6 +27,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ExecutorService;
@@ -57,6 +58,7 @@ import org.apache.solr.crossdc.manager.consumer.Consumer;
import org.apache.solr.util.SolrKafkaTestsIgnoredThreadsFilter;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -89,6 +91,11 @@ public class SolrAndKafkaIntegrationTest extends
SolrCloudTestCase {
private static final String ALT_COLLECTION = "collection2";
private static Thread.UncaughtExceptionHandler uceh;
+ @BeforeClass
+ public static void beforeAll() {
+ ensureCompatibleLocale();
+ }
+
@Before
public void beforeSolrAndKafkaIntegrationTest() throws Exception {
uceh = Thread.getDefaultUncaughtExceptionHandler();
@@ -351,4 +358,10 @@ public class SolrAndKafkaIntegrationTest extends
SolrCloudTestCase {
assertTrue("results=" + results, foundUpdates);
}
+
+ public static void ensureCompatibleLocale() {
+ assumeTrue(
+ "The current default locale is not compatible with the Kafka server",
+ "CLASSIC".equals("classic".toUpperCase(Locale.getDefault())));
+ }
}
diff --git
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaMultiCollectionIntegrationTest.java
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaMultiCollectionIntegrationTest.java
index 279b34f750f..26ecfd34e25 100644
---
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaMultiCollectionIntegrationTest.java
+++
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaMultiCollectionIntegrationTest.java
@@ -51,6 +51,7 @@ import org.apache.solr.crossdc.manager.consumer.Util;
import org.apache.solr.util.SolrKafkaTestsIgnoredThreadsFilter;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -86,6 +87,11 @@ public class SolrAndKafkaMultiCollectionIntegrationTest
extends SolrCloudTestCas
private static final String COLLECTION = "collection1";
private static final String ALT_COLLECTION = "collection2";
+ @BeforeClass
+ public static void beforeAll() {
+ SolrAndKafkaIntegrationTest.ensureCompatibleLocale();
+ }
+
@Before
public void beforeSolrAndKafkaIntegrationTest() throws Exception {
System.setProperty(KafkaCrossDcConf.PORT, "-1");
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 0e3847acc21..5aa7c1ddf51 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
@@ -74,6 +74,8 @@ public class SolrAndKafkaReindexTest extends
SolrCloudTestCase {
@BeforeClass
public static void beforeSolrAndKafkaIntegrationTest() throws Exception {
+ SolrAndKafkaIntegrationTest.ensureCompatibleLocale();
+
System.setProperty(KafkaCrossDcConf.PORT, "-1");
consumer = new Consumer();
@@ -140,7 +142,9 @@ public class SolrAndKafkaReindexTest extends
SolrCloudTestCase {
solrCluster2.shutdown();
}
- consumer.shutdown();
+ if (consumer != null) {
+ consumer.shutdown();
+ }
try {
if (kafkaCluster != null) {
diff --git
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/ZkConfigIntegrationTest.java
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/ZkConfigIntegrationTest.java
index 0ea592a2805..f926e9178ea 100644
---
a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/ZkConfigIntegrationTest.java
+++
b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/ZkConfigIntegrationTest.java
@@ -75,6 +75,8 @@ public class ZkConfigIntegrationTest extends
SolrCloudTestCase {
@BeforeClass
public static void beforeSolrAndKafkaIntegrationTest() throws Exception {
+ SolrAndKafkaIntegrationTest.ensureCompatibleLocale();
+
System.setProperty(KafkaCrossDcConf.PORT, "-1");
consumer1 = new Consumer();
consumer2 = new Consumer();
@@ -170,13 +172,19 @@ public class ZkConfigIntegrationTest extends
SolrCloudTestCase {
solrCluster2.shutdown();
}
- consumer1.shutdown();
- consumer2.shutdown();
+ if (consumer1 != null) {
+ consumer1.shutdown();
+ }
+ if (consumer2 != null) {
+ consumer2.shutdown();
+ }
- try {
- kafkaCluster.stop();
- } catch (Exception e) {
- log.error("Exception stopping Kafka cluster", e);
+ if (kafkaCluster != null) {
+ try {
+ kafkaCluster.stop();
+ } catch (Exception e) {
+ log.error("Exception stopping Kafka cluster", e);
+ }
}
solrCluster1 = null;
