You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2022/06/08 14:44:06 UTC
[solr] 02/02: backport SOLR-16223
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 1d607d4483dc37195a9fac57538cb3ade21fbd92
Author: epugh@opensourceconnections.com <ep...@opensourceconnections.com>
AuthorDate: Wed Jun 8 10:43:51 2022 -0400
backport SOLR-16223
---
.../src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java | 3 ++-
solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java | 3 ++-
solr/core/src/test/org/apache/solr/cloud/OverseerTest.java | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java
index 85f2928e1d8..8c38e40a312 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.cloud;
+import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.List;
@@ -255,7 +256,7 @@ public class ChaosMonkeyShardSplitTest extends ShardSplitTest {
* @return SolrZkClient
*/
private SolrZkClient electNewOverseer(String address)
- throws KeeperException, InterruptedException {
+ throws KeeperException, InterruptedException, IOException {
SolrZkClient zkClient = new SolrZkClient(address, TIMEOUT);
ZkStateReader reader = new ZkStateReader(zkClient);
LeaderElector overseerElector = new LeaderElector(zkClient);
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
index 04986d2ee45..40ef7d88c90 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
import static org.apache.solr.common.cloud.ZkStateReader.URL_SCHEME;
+import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -172,7 +173,7 @@ public class LeaderElectionTest extends SolrTestCaseJ4 {
}
}
- private void setupOnConnect() throws InterruptedException, KeeperException {
+ private void setupOnConnect() throws InterruptedException, KeeperException, IOException {
assertNotNull(es);
TestLeaderElectionContext context =
new TestLeaderElectionContext(
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
index d06e2ae00d6..b2e9c39f643 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
@@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
+import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.cloud.DistributedQueue;
@@ -1836,7 +1836,7 @@ public class OverseerTest extends SolrTestCaseJ4 {
}
private SolrZkClient electNewOverseer(String address)
- throws InterruptedException, KeeperException, NoSuchFieldException, SecurityException,
+ throws InterruptedException, IOException, KeeperException, NoSuchFieldException, SecurityException,
IllegalAccessException {
SolrZkClient zkClient = new SolrZkClient(address, TIMEOUT);
zkClients.add(zkClient);