[lucene-solr] 05/07: @1147 Don't use version from clusterstate object.

[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 376d23659eebfd636d8e1614e9b6162e77bbb0d6
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Nov 10 15:40:35 2020 -0600

    @1147 Don't use version from clusterstate object.
---
 solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 c90db99..971e505 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
@@ -330,10 +330,13 @@ public class ZkStateWriter {
               if (log.isDebugEnabled()) log.debug("Write state.json prevVersion={} bytes={} col={}", collection.getZNodeVersion(), data.length, collection);
 
               try {
-                int version = collection.getZNodeVersion();
+              
                 Integer v = trackVersions.get(collection.getName());
+                Integer version;
                 if (v != null) {
                   version = v;
+                } else {
+                  version = reader.getZkClient().exists(path, null).getVersion();
                 }
                 lastVersion.set(version);
                 reader.getZkClient().setData(path, data, version, true);