You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2025/02/24 20:40:12 UTC
(solr) branch main updated: Finally fix TestCoordinatorRole for good. (#3205)
This is an automated email from the ASF dual-hosted git repository.
houston 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 5a8adec0a57 Finally fix TestCoordinatorRole for good. (#3205)
5a8adec0a57 is described below
commit 5a8adec0a5737ecd695b52d77887b8ac5e22faac
Author: Houston Putman <ho...@apache.org>
AuthorDate: Mon Feb 24 14:40:06 2025 -0600
Finally fix TestCoordinatorRole for good. (#3205)
---
.../test/org/apache/solr/search/TestCoordinatorRole.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java
index cafe7ed0268..d14a98cf0f8 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java
@@ -361,11 +361,17 @@ public class TestCoordinatorRole extends SolrCloudTestCase {
// TODO: could separate this out into a different test method, but this should suffice for
// now
pullJetty.start(true);
+ waitForState(
+ "Pull jetty replicas didn't become active in time",
+ COLL,
+ ((liveNodes, collectionState) ->
+ collectionState.getReplicas(pullJettyF.getNodeName()).stream()
+ .allMatch(rep -> rep.getState() == Replica.State.ACTIVE)));
AtomicBoolean done = new AtomicBoolean();
long runMinutes = 1;
long finishTimeMs =
new Date().getTime() + TimeUnit.MILLISECONDS.convert(runMinutes, TimeUnit.MINUTES);
- JettySolrRunner[] jettys = new JettySolrRunner[] {nrtJettyF, pullJettyF};
+ JettySolrRunner[] jettys = new JettySolrRunner[] {pullJettyF, nrtJettyF};
Random threadRandom = new Random(r.nextInt());
Future<Integer> f =
executor.submit(
@@ -386,6 +392,12 @@ public class TestCoordinatorRole extends SolrCloudTestCase {
log.info("restarting {} ...", idx);
toManipulate.start(true);
log.info("restarted {}.", idx);
+ waitForState(
+ toManipulate.getNodeName() + " replicas didn't become active in time",
+ COLL,
+ ((liveNodes, collectionState) ->
+ collectionState.getReplicas(toManipulate.getNodeName()).stream()
+ .allMatch(rep -> rep.getState() == Replica.State.ACTIVE)));
} catch (Exception e) {
throw new RuntimeException(e);
}