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/10/09 03:40:26 UTC
[lucene-solr] branch reference_impl_dev updated (37ea22b -> 18a771c)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 37ea22b @965 Enable this reload test.
new b3e4d20 @966 Harden ReplaceNodeTest.
new 18a771c @967 Update this note about flakey test.
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:
.../core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java | 2 +-
.../org/apache/solr/response/transform/TestChildDocTransformer.java | 4 +++-
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
[lucene-solr] 01/02: @966 Harden ReplaceNodeTest.
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_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit b3e4d20380ada7578ea5804669d50785a642282b
Author: markrmiller <ma...@gmail.com>
AuthorDate: Thu Oct 8 19:53:56 2020 -0500
@966 Harden ReplaceNodeTest.
---
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java | 2 +-
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index b2042bc..74eeb61 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -148,7 +148,7 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNa
if(taskId != null) {
// Put the tasks into the maps for tracking
- if (getRequestStatusMap(RUNNING).containsKey(taskId) || getRequestStatusMap(COMPLETED).containsKey(taskId) || getRequestStatusMap(FAILED).containsKey(taskId)) {
+ if (getRequestStatusMap(RUNNING).containsKey(taskId) || getRequestStatusMap(COMPLETED).containsKey(taskId)) {
throw new SolrException(ErrorCode.BAD_REQUEST,
"Duplicate request with the same requestid found.");
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 2a1c4c2..71a8c19 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -1325,7 +1325,7 @@ public class ZkStateReader implements SolrCloseable {
event, coll, liveNodes.size());
}
- if (!isClosed()) {
+ if (!closed) {
refreshAndWatch();
}
[lucene-solr] 02/02: @967 Update this note about 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_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 18a771ca7059d6a425e022edfe84067d79cbf3b5
Author: markrmiller <ma...@gmail.com>
AuthorDate: Thu Oct 8 19:56:27 2020 -0500
@967 Update this note about flakey test.
---
.../org/apache/solr/response/transform/TestChildDocTransformer.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
index 31f1e8f..c286e36 100644
--- a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import static org.hamcrest.core.StringContains.containsString;
-// nocommit - note this test is flakey, I think sometimes does not return a version
+// nocommit - note this test is flakey, I think sometimes does not return a version - testParentFilter and testAllParams
public class TestChildDocTransformer extends SolrTestCaseJ4 {
private static String ID_FIELD = "id";
@@ -50,6 +50,7 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
}
@Test
+ // nocommit - note this test is flakey, I think sometimes does not return a version - testParentFilter and testAllParams
public void testParentFilter() throws Exception {
for(int i=0; i<titleVals.length; i++) {
titleVals[i] = TestUtil.randomSimpleString(random(), 1, 20);
@@ -62,6 +63,7 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
}
@Test
+ // nocommit - note this test is flakey, I think sometimes does not return a version - testParentFilter and testAllParams
public void testAllParams() throws Exception {
createSimpleIndex();
testChildDoctransformerJSON();