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/08/30 15:40:16 UTC
[lucene-solr] branch reference_impl updated (5f96daa -> bc346dc)
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 5f96daa @629 Defend against NPE you can get with this kind of wild coredescriptor thing we do now.
new 48d2a67 @630 Trade off a bit of test time to see if this is causing spurious fails.
new bc346dc @631 Try to avoid some ugly race here.
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:
.../org/apache/solr/cloud/api/collections/CreateCollectionCmd.java | 2 +-
solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
[lucene-solr] 02/02: @631 Try to avoid some ugly race here.
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 bc346dc9754cae841428e7af81eb2acf90acc69a
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Aug 30 10:26:20 2020 -0500
@631 Try to avoid some ugly race here.
---
.../java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 6c20391..c07cbc8 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
@@ -194,7 +194,7 @@ public class CreateCollectionCmd implements OverseerCollectionMessageHandler.Cmd
ocmh.zkStateReader.waitForState(collectionName, 10, TimeUnit.SECONDS, (n, c) -> c != null);
// refresh cluster state
- clusterState = ocmh.cloudManager.getClusterStateProvider().getClusterState();
+ clusterState = ocmh.zkStateReader.getClusterState();
List<ReplicaPosition> replicaPositions = null;
// try {
[lucene-solr] 01/02: @630 Trade off a bit of test time to see if
this is causing spurious fails.
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 48d2a67c654efe3871e51bf49040a6361cd9ac6d
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Aug 30 10:01:59 2020 -0500
@630 Trade off a bit of test time to see if this is causing spurious fails.
---
solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
index b4f1d5d..17dd48b 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
@@ -410,8 +410,8 @@ public class ZkTestServer implements Closeable {
cnxnFactory.shutdown();
cnxnFactory.join();
-
- ((Thread)zkServer.zooKeeperServer.getSessionTracker()).interrupt();
+ // eats some extra sleep time not to do this, but I think it can cause spurious fails
+ //((Thread)zkServer.zooKeeperServer.getSessionTracker()).interrupt();
((Thread)zkServer.zooKeeperServer.getSessionTracker()).join();
return cnxnFactory;
});