[lucene-solr] branch reference_impl updated: @344 Needs some actual time and focus, but just spray some water that way.

[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


The following commit(s) were added to refs/heads/reference_impl by this push:
     new 8fb696e  @344 Needs some actual time and focus, but just spray some water that way.
8fb696e is described below

commit 8fb696e460198b0e67ffe5c7706c9bb534a644f1
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Jul 26 10:55:19 2020 -0500

    @344 Needs some actual time and focus, but just spray some water that way.
---
 .../java/org/apache/solr/cloud/overseer/ZkStateWriter.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 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 2133f3e..7c39db3 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
@@ -123,6 +123,9 @@ public class ZkStateWriter {
         continue;
 //        log.info("BadVersion");
 //        throw new AlreadyClosedException();
+      } catch (Exception e) {
+        log.error("Ran into unexpected exception trying to write new cluster state", e);
+        throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
       }
       break;
     }
@@ -287,13 +290,13 @@ public class ZkStateWriter {
 
         } catch (InterruptedException e) {
           ParWork.propegateInterrupt(e);
-          throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Interrupted", e);
+          throw e;
         } catch (Exception e) {
           ParWork.propegateInterrupt(e);
           if (e instanceof KeeperException.BadVersionException) {
             // nocommit invalidState = true;
-            if (log.isDebugEnabled())
-              log.debug("Tried to update the cluster state using version={} but we where rejected, currently at {}", prevVersion, ((KeeperException.BadVersionException) e).getMessage(), e);
+            //if (log.isDebugEnabled())
+            log.info("Tried to update the cluster state using version={} but we where rejected, currently at {}", prevVersion, ((KeeperException.BadVersionException) e).getMessage(), e);
             throw (KeeperException.BadVersionException) e;
           }
           ParWork.propegateInterrupt(e);
@@ -332,7 +335,7 @@ public class ZkStateWriter {
       success = true;
     } catch (KeeperException.BadVersionException bve) {
       // this is a tragic error, we must disallow usage of this instance
-      //  log.error("Tried to update the cluster state using version={} but we where rejected as the version is {}", newClusterState.getZNodeVersion(), bve.getMessage(), bve);
+       log.warn("Tried to update the cluster state using version={} but we where rejected as the version is {}", newClusterState.getZNodeVersion(), bve.getMessage(), bve);
       // nocommit invalidState = true;
       throw bve;
     } finally {