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/07/11 19:49:20 UTC

[lucene-solr] branch reference_impl updated: #72 It's against my religion, but right now the Oveerser has to keep on truckin in these spots - you can zk timeout or such.

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 ce8de3e  #72 It's against my religion, but right now the Oveerser has to keep on truckin in these spots - you can zk timeout or such.
ce8de3e is described below

commit ce8de3e64558d65bac33c8c23fc10376305231fe
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Jul 11 14:49:07 2020 -0500

    #72 It's against my religion, but right now the Oveerser has to keep on truckin in these spots - you can zk timeout or such.
---
 solr/core/src/java/org/apache/solr/cloud/Overseer.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 3297044..1b7804a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -237,7 +237,8 @@ public class Overseer implements SolrCloseable {
         ParWork.propegateInterrupt(e);
         return;
       } catch (Exception e) {
-       log.error("Error", e);
+        log.error("Unexpected error in Overseer state update loop", e);
+        throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
       }
 
       log.info("Starting to work on the main queue : {}", LeaderElector.getNodeName(myId));
@@ -310,9 +311,8 @@ public class Overseer implements SolrCloseable {
               ParWork.propegateInterrupt(e);
               return;
             } catch (Exception e) {
-              log.error("Exception in Overseer when process message from work queue, retrying", e);
-
-              throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
+              log.error("Unexpected error in Overseer state update loop", e);
+              continue;
             }
           }
 
@@ -329,8 +329,8 @@ public class Overseer implements SolrCloseable {
             log.warn("Solr cannot talk to ZK, exiting Overseer work queue loop", e);
             return;
           } catch (Exception e) {
-            ParWork.propegateInterrupt(e);
-            throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
+            log.error("Unexpected error in Overseer state update loop", e);
+            continue;
           }
           try {
             Set<String> processedNodes = new HashSet<>();
@@ -368,7 +368,8 @@ public class Overseer implements SolrCloseable {
             log.warn("Solr cannot talk to ZK, exiting Overseer work queue loop", e);
             return;
           } catch (Exception e) {
-            throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
+            log.error("Unexpected error in Overseer state update loop", e);
+            continue;
           }
         }
       } finally {