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:26:57 UTC
[lucene-solr] 01/02: @758 Init version at 1.
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 ff52f9966a85af731567e5e27966d10393a23b71
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;