[lucene-solr] 05/08: @682 If we can't write the state update due to version conflict, bail for new Overseer.

[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 46a79d1f14a222915040d1668d8644e86ff5130c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Sep 1 17:12:22 2020 -0500

    @682 If we can't write the state update due to version conflict, bail for new Overseer.
---
 .../java/org/apache/solr/cloud/overseer/ZkStateWriter.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 7dc7dec..cf99221 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
@@ -254,8 +254,8 @@ public class ZkStateWriter {
             log.info(
                 "Tried to update the cluster state using version={} but we where rejected, currently at {}",
                 prevVersion, c == null ? "null" : c.getZNodeVersion(), e);
-            prevState = reader.getClusterState();
-            continue;
+
+            throw e;
           }
           ParWork.propegateInterrupt(e);
           throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
@@ -339,9 +339,10 @@ public class ZkStateWriter {
               log.warn(
                   "Tried to update the cluster state using version={} but we where rejected, found {}",
                   c.getZNodeVersion(), stat.getVersion(), bve);
-              lastUpdatedTime = -1;
-              failedUpdates.put(name, c);
-              continue;
+              throw bve;
+           //   lastUpdatedTime = -1;
+//              failedUpdates.put(name, c);
+//              continue;
             }
           } else {