You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/09/06 12:36:25 UTC
[lucene-solr] branch reference_impl updated (74c2cd0 -> 7b75a94)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 74c2cd0 @755 These asserts don't fail tests and just cause bs differences with prod by throwing Errors.
new 7238f06 @756 Update flakey test.
new 7b75a94 @757 Small tweak.
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/cloud/api/collections/CreateCollectionCmd.java | 4 ++--
solr/core/src/java/org/apache/solr/handler/SQLHandler.java | 2 +-
.../src/test/org/apache/solr/handler/export/TestExportWriter.java | 8 ++------
3 files changed, 5 insertions(+), 9 deletions(-)
[lucene-solr] 02/02: @757 Small tweak.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 7b75a94477c77d7a325adf50d57af503275c3579
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Sep 6 07:35:13 2020 -0500
@757 Small tweak.
---
.../org/apache/solr/cloud/api/collections/CreateCollectionCmd.java | 4 ++--
solr/core/src/java/org/apache/solr/handler/SQLHandler.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
index 8a4ce7c..efd773d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
@@ -328,8 +328,8 @@ public class CreateCollectionCmd implements OverseerCollectionMessageHandler.Cmd
if(!isLegacyCloud) {
// wait for all replica entries to be created
Map<String,Replica> replicas = new HashMap<>();
- zkStateReader.waitForState(collectionName, 10, TimeUnit.SECONDS, (n, c) -> c != null && c.getSlices().size() == shardNames.size());
- zkStateReader.waitForState(collectionName, 5, TimeUnit.SECONDS, expectedReplicas(coresToCreate.size(), replicas)); // nocommit - timeout - keep this below containing timeouts - need central timeout stuff
+ zkStateReader.waitForState(collectionName, 5, TimeUnit.SECONDS, (n, c) -> c != null && c.getSlices().size() == shardNames.size());
+ zkStateReader.waitForState(collectionName, 10, TimeUnit.SECONDS, expectedReplicas(coresToCreate.size(), replicas)); // nocommit - timeout - keep this below containing timeouts - need central timeout stuff
// TODO what if replicas comes back wrong?
if (replicas.size() > 0) {
for (Map.Entry<String, ShardRequest> e : coresToCreate.entrySet()) {
diff --git a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
index 34d8e5c..1efc4dc 100644
--- a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
@@ -61,7 +61,7 @@ public class SQLHandler extends RequestHandlerBase implements SolrCoreAware, Per
public void inform(SolrCore core) {
CoreContainer coreContainer = core.getCoreContainer();
- if(coreContainer.isZooKeeperAware()) {
+ if (coreContainer.isZooKeeperAware()) {
defaultZkhost = core.getCoreContainer().getZkController().getZkServerAddress();
defaultWorkerCollection = core.getCoreDescriptor().getCollectionName();
isCloud = true;
[lucene-solr] 01/02: @756 Update flakey test.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 7238f06ee0b01864929c21961f2cb0184ea65789
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Sep 5 22:08:04 2020 -0500
@756 Update flakey test.
---
.../src/test/org/apache/solr/handler/export/TestExportWriter.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
index 4605a07..3ee0af3 100644
--- a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
+++ b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
@@ -728,6 +728,7 @@ public class TestExportWriter extends SolrTestCaseJ4 {
}
@Test
+ @AwaitsFix(bugUrl = "flakey, can return 99 instead of 100 results, missing 95 in results")
public void testExpr() throws Exception {
assertU(delQ("*:*"));
assertU(commit());
@@ -752,12 +753,7 @@ public class TestExportWriter extends SolrTestCaseJ4 {
List<Map<String, Object>> docs = (List<Map<String, Object>>) Utils.getObjectByPath(rspMap, false, "/response/docs");
assertNotNull("missing document results: " + rspMap, docs);
- if (docs.size() == 99) {
- // TODO: sometimes this can happen
- } else {
- assertEquals("wrong number of unique docs", 100, docs.size());
- }
-
+ assertEquals("wrong number of unique docs", 100, docs.size());
for (int i = 0; i < 99; i++) {
boolean found = false;