You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2021/10/21 21:22:34 UTC
[solr] branch main updated (174f7c1 -> 9b6de00)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git.
from 174f7c1 SOLR-15702: Fix S3Repository to follow BackupRepository.createDirectory() API contract
new 5f19271 SOLR-15687: UpdateLogCloudTest.implTest to await completion of any recoveries before requesting updates
new 9b6de00 SOLR-15687: UpdateLogCloudTest to avoid shard leadership transition
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/solr/handler/component/UpdateLogCloudTest.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
[solr] 01/02: SOLR-15687: UpdateLogCloudTest.implTest to await
completion of any recoveries before requesting updates
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 5f1927121bd63b39ff8d10b5649f12b3f7e71e2b
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Thu Oct 21 20:05:16 2021 +0100
SOLR-15687: UpdateLogCloudTest.implTest to await completion of any recoveries before requesting updates
---
.../src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java
index 85544cb..1f29532 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java
@@ -77,6 +77,7 @@ public class UpdateLogCloudTest extends SolrCloudTestCase {
}
cluster.getJettySolrRunner(0).stop();
+ AbstractDistribZkTestBase.waitForRecoveriesToFinish(COLLECTION, cluster.getSolrClient().getZkStateReader(), false, true, DEFAULT_TIMEOUT);
new UpdateRequest()
.add(sdoc("id", "1", "a_t", "one"))
[solr] 02/02: SOLR-15687: UpdateLogCloudTest to avoid shard
leadership transition
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 9b6de00b923b49bed572c445ba26c30fb5c4c3f3
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Thu Oct 21 21:14:33 2021 +0100
SOLR-15687: UpdateLogCloudTest to avoid shard leadership transition
---
.../apache/solr/handler/component/UpdateLogCloudTest.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java
index 1f29532..d733014 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java
@@ -71,12 +71,18 @@ public class UpdateLogCloudTest extends SolrCloudTestCase {
@Test
public void test() throws Exception {
+ int specialIdx = 0;
+
final List<SolrClient> solrClients = new ArrayList<>();
for (JettySolrRunner jettySolrRunner : cluster.getJettySolrRunners()) {
+ if (!jettySolrRunner.getBaseUrl().toString().equals(
+ getCollectionState(COLLECTION).getLeader("shard1").getBaseUrl())) {
+ specialIdx = solrClients.size();
+ }
solrClients.add(jettySolrRunner.newClient());
}
- cluster.getJettySolrRunner(0).stop();
+ cluster.getJettySolrRunner(specialIdx).stop();
AbstractDistribZkTestBase.waitForRecoveriesToFinish(COLLECTION, cluster.getSolrClient().getZkStateReader(), false, true, DEFAULT_TIMEOUT);
new UpdateRequest()
@@ -85,12 +91,12 @@ public class UpdateLogCloudTest extends SolrCloudTestCase {
.deleteByQuery("a_t:three")
.commit(cluster.getSolrClient(), COLLECTION);
- cluster.getJettySolrRunner(0).start();
+ cluster.getJettySolrRunner(specialIdx).start();
AbstractDistribZkTestBase.waitForRecoveriesToFinish(COLLECTION, cluster.getSolrClient().getZkStateReader(), false, true, DEFAULT_TIMEOUT);
int idx = 0;
for (SolrClient solrClient : solrClients) {
- implTest(solrClient, idx==0 ? 0 : 3);
+ implTest(solrClient, idx==specialIdx ? 0 : 3);
++idx;
}