You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by no...@apache.org on 2022/10/12 12:21:24 UTC

[solr] branch jira/solr-16640 updated: more logging 4

This is an automated email from the ASF dual-hosted git repository.

noble pushed a commit to branch jira/solr-16640
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/jira/solr-16640 by this push:
     new 7a467df48c6 more logging 4
7a467df48c6 is described below

commit 7a467df48c6657c84fd17af26cda230c40fff3bc
Author: Noble Paul <no...@gmail.com>
AuthorDate: Wed Oct 12 23:21:13 2022 +1100

    more logging 4
---
 solr/core/src/java/org/apache/solr/cloud/Overseer.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 3aef07f430b..ae964d2bc79 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -347,22 +347,23 @@ public class Overseer implements SolrCloseable {
                 // force flush to ZK after each message because there is no fallback if workQueue
                 // items
                 // are removed from workQueue but fail to be written to ZK
+                ClusterState csCopy = clusterState;
                 while (unprocessedMessages.size() > 0) {
-                  clusterState = zkStateWriter.writePendingUpdates();
+                  clusterState = csCopy = zkStateWriter.writePendingUpdates();
                   Message m = unprocessedMessages.remove(0);
                   log.info("a_Message({})", m);
-                  clusterState = m.run(clusterState, Overseer.this);
+                  clusterState = csCopy = m.run(clusterState, Overseer.this);
                   if (m instanceof RefreshCollectionMessage) {
                     RefreshCollectionMessage refreshCollectionMessage = (RefreshCollectionMessage) m;
                     log.info("coll :{}, found : {}",refreshCollectionMessage.collection,
-                            clusterState.getCollectionOrNull(refreshCollectionMessage.collection) );
+                            csCopy.getCollectionOrNull(refreshCollectionMessage.collection) );
                   }
                 }
                 // The callback always be called on this thread
                 clusterState =
                     processQueueItem(
                         message,
-                        clusterState,
+                        csCopy,
                         zkStateWriter,
                         true,
                         () -> {