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/13 08:03:21 UTC
[solr] branch jira/solr-16640 updated: copy clusterState to ZkStateWriter as well
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 9aaa00a06e7 copy clusterState to ZkStateWriter as well
9aaa00a06e7 is described below
commit 9aaa00a06e7bc5fb553089a67f11d343ca1fef39
Author: Noble Paul <no...@gmail.com>
AuthorDate: Thu Oct 13 19:03:12 2022 +1100
copy clusterState to ZkStateWriter as well
---
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 6 +++++-
.../core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 2 +-
2 files changed, 6 insertions(+), 2 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 18b6877a539..a844ce33366 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -356,7 +356,11 @@ public class Overseer implements SolrCloseable {
log.info("CHECKPOINT9 , CS : {}", clusterState.hashCode());
Message m = unprocessedMessages.remove(0);
log.info("a_Message({})", m);
- clusterState = m.run(clusterState, Overseer.this);
+ ClusterState clusterStateModified = m.run(clusterState, Overseer.this);
+ if(clusterStateModified != clusterState) {
+ zkStateWriter.clusterState = clusterStateModified;
+ }
+ clusterState = clusterStateModified;
log.info("CHECKPOINT0 , CS : {}", clusterState.hashCode());
if (m instanceof RefreshCollectionMessage) {
RefreshCollectionMessage refreshCollectionMessage = (RefreshCollectionMessage) m;
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 2908382e1c1..3752530c809 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
@@ -67,7 +67,7 @@ public class ZkStateWriter {
protected Map<String, ZkWriteCommand> updates = new HashMap<>();
private int numUpdates = 0;
- protected ClusterState clusterState = null;
+ public ClusterState clusterState = null;
protected long lastUpdatedTime = 0;
/**