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 14:34:49 UTC
[lucene-solr] branch reference_impl updated (239b899 -> 0f9b5b3)
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 239b899 @757 Try thread safe.
new a802910 @758 Init version at 1.
new 0f9b5b3 @759 Harden 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:
.../src/java/org/apache/solr/cloud/Overseer.java | 2 --
.../solr/cloud/overseer/ClusterStateMutator.java | 2 +-
.../apache/solr/cloud/overseer/ZkStateWriter.java | 21 ---------------------
.../org/apache/solr/search/TestSolr4Spatial2.java | 2 +-
4 files changed, 2 insertions(+), 25 deletions(-)
[lucene-solr] 01/02: @758 Init version at 1.
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 a80291035db5d056b371847abec69e60dcccf930
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Sep 6 09:24:23 2020 -0500
@758 Init version at 1.
---
.../src/java/org/apache/solr/cloud/Overseer.java | 2 --
.../solr/cloud/overseer/ClusterStateMutator.java | 2 +-
.../apache/solr/cloud/overseer/ZkStateWriter.java | 21 ---------------------
3 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 35a9f14..268544c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -201,7 +201,6 @@ public class Overseer implements SolrCloseable {
private final ZkDistributedQueue workQueue;
private volatile boolean isClosed = false;
- private int lastVersion;
public ClusterStateUpdater(final ZkStateReader reader, final String myId, Stats zkStats) {
this.zkClient = reader.getZkClient();
@@ -453,7 +452,6 @@ public class Overseer implements SolrCloseable {
() -> {
// log.info("on write callback");
});
- lastVersion = cs.getZNodeVersion();
// }
return cs;
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
index f7373d6..54363ce 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
@@ -116,7 +116,7 @@ public class ClusterStateMutator {
: ZkStateReader.getCollectionPath(cName);
DocCollection newCollection = new DocCollection(cName,
- slices, collectionProps, router, -1, znode);
+ slices, collectionProps, router, 1, znode);
return new ZkWriteCommand(cName, newCollection);
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index 4e76974..1b4f477 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -324,7 +324,6 @@ public class ZkStateWriter {
try {
// if (reader.getClusterState().getCollectionOrNull(c.getName()) != null) {
- if (true) {
byte[] data = Utils.toJSON(singletonMap(c.getName(), c));
@@ -334,7 +333,6 @@ public class ZkStateWriter {
// stat = reader.getZkClient().getCurator().setData().withVersion(prevVersion).forPath(path, data);
try {
stat = reader.getZkClient().setData(path, data, c.getZNodeVersion(), false);
- break;
} catch (KeeperException.BadVersionException bve) {
// this is a tragic error, we must disallow usage of this instance
log.warn(
@@ -345,26 +343,7 @@ public class ZkStateWriter {
// failedUpdates.put(name, c);
// continue;
}
- } else {
-
- byte[] data = Utils.toJSON(singletonMap(c.getName(), c));
- // reader.getZkClient().getCurator().create().storingStatIn(stat).forPath(path, data); // nocommit look at
- // async updates
- if (log.isDebugEnabled()) {
- log.debug("Write state.json bytes={} cs={}", data.length,
- state);
- }
- try {
- reader.getZkClient().create(path, data, CreateMode.PERSISTENT, true);
- } catch (KeeperException.NodeExistsException e) {
- log.error("collection already exists");
- failedUpdates.put(name, c);
- continue;
- }
- }
-
- break;
} catch (InterruptedException | AlreadyClosedException e) {
ParWork.propegateInterrupt(e);
throw e;
[lucene-solr] 02/02: @759 Harden 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 0f9b5b32c9aac2e51bf6af59d0f65b180e8ebf75
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Sep 6 09:26:35 2020 -0500
@759 Harden test.
---
solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java
index 97119c8..f56776d 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java
@@ -188,7 +188,7 @@ public class TestSolr4Spatial2 extends SolrTestCaseJ4 {
//max found by trial & error. If we used 8 decimal places then we could get down to 1.04cm accuracy but then we
// lose the ability to round-trip -- 40 would become 39.99999997 (ugh).
- assertTrue("deltaCm too high: " + deltaCentimeters, deltaCentimeters < 1.47);
+ assertTrue("deltaCm too high: " + deltaCentimeters, deltaCentimeters < 1.48);
// Pt(x=105.29894270124083,y=-0.4371673760042398) to Pt(x=105.2989428,y=-0.4371673) is 1.38568
}