[solr] branch main updated: SOLR-16452 : do not update PRS state if the local version is newer

[no...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 157c2caaed7 SOLR-16452 : do not update PRS state if the local version is newer
157c2caaed7 is described below

commit 157c2caaed7e62141af56518ac7b4a524df24b6e
Author: Noble Paul <no...@gmail.com>
AuthorDate: Mon Oct 17 16:53:41 2022 +1100

    SOLR-16452 : do not update PRS state if the local version is newer
---
 solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
index fa1a8f415c2..6d4f6394d45 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
@@ -146,7 +146,7 @@ public class DocCollection extends ZkNodeProps implements Iterable<Slice> {
           getChildNodesVersion(),
           newPerReplicaStates.cversion);
     }
-    if (getChildNodesVersion() == newPerReplicaStates.cversion) return this;
+    if (getChildNodesVersion() >= newPerReplicaStates.cversion) return this;
     Set<String> modifiedReplicas =
         PerReplicaStates.findModifiedReplicas(newPerReplicaStates, this.perReplicaStates);
     if (modifiedReplicas.isEmpty()) return this; // nothing is modified