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/13 17:03:57 UTC
[lucene-solr] branch reference_impl_dev updated: @986 Tweaks to the
last commit around local collection zk version tracking.
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
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 25f88e8 @986 Tweaks to the last commit around local collection zk version tracking.
25f88e8 is described below
commit 25f88e897d2d17e6ffdcb1db61ccf09992de3121
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Oct 13 12:03:37 2020 -0500
@986 Tweaks to the last commit around local collection zk version tracking.
---
.../src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
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 4aecdc9..403d0cd 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
@@ -160,7 +160,13 @@ public class ZkStateWriter {
log.debug("enqueueUpdate() - going to create_collection {}", path);
}
// assert c.getStateFormat() > 1;
- DocCollection newCollection = new DocCollection(name, c.getSlicesMap(), c.getProperties(), c.getRouter(), 0);
+ int version = 0;
+ DocCollection prevCol = prevState.getCollectionOrNull(c.getName());
+ if (prevCol != null) {
+ version = prevCol.getZNodeVersion();
+ }
+
+ DocCollection newCollection = new DocCollection(name, c.getSlicesMap(), c.getProperties(), c.getRouter(), version);
LinkedHashMap<String,ClusterState.CollectionRef> collStates = new LinkedHashMap<>(prevState.getCollectionStates());
collStates.put(name, new ClusterState.CollectionRef(newCollection));
@@ -246,7 +252,7 @@ public class ZkStateWriter {
try {
int version = c.getZNodeVersion();
Integer v = trackVersions.get(c.getName());
- if (v != null && version == 0) {
+ if (v != null) {
version = v;
trackVersions.put(c.getName(), v + 1);
} else {