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 2023/04/12 00:55:38 UTC

[solr] branch branch_9x updated: SOLR-16741: CLUSTERSTATUS API returns wrong value for state ,leader for PRS collections (#1549)

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

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


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 8d5cdb49e9a SOLR-16741: CLUSTERSTATUS API returns wrong value for state ,leader for PRS collections (#1549)
8d5cdb49e9a is described below

commit 8d5cdb49e9a20f91e958307bb957515afffcd8bc
Author: Noble Paul <no...@users.noreply.github.com>
AuthorDate: Wed Apr 12 10:54:29 2023 +1000

    SOLR-16741: CLUSTERSTATUS API returns wrong value for state ,leader for PRS collections (#1549)
---
 .../apache/solr/common/cloud/ZkStateReader.java    |  2 +-
 .../java/org/apache/solr/common/cloud/Replica.java | 38 ++++++++++------------
 .../cloud/PerReplicaStatesIntegrationTest.java     | 29 ++++++++++++++---
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 3d10656717c..822d713096f 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -81,7 +81,7 @@ public class ZkStateReader implements SolrCloseable {
   public static final String STATE_PROP = "state";
   // if this flag equals to false and the replica does not exist in cluster state, set state op
   // become no op (default is true)
-  public static final String FORCE_SET_STATE_PROP = "force_set_state";
+  public static final String FORCE_SET_STATE_PROP = Replica.ReplicaStateProps.FORCE_SET_STATE;
   /** SolrCore name. */
   public static final String CORE_NAME_PROP = "core";
 
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java
index 583c4a4e494..7c2de199b4f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java
@@ -16,19 +16,14 @@
  */
 package org.apache.solr.common.cloud;
 
-import static org.apache.solr.common.ConditionalMapWriter.NON_NULL_VAL;
-import static org.apache.solr.common.ConditionalMapWriter.dedupeKeyPredicate;
-
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.function.BiPredicate;
 import org.apache.solr.common.MapWriter;
 import org.apache.solr.common.util.Utils;
 import org.noggit.JSONWriter;
@@ -392,30 +387,27 @@ public class Replica extends ZkNodeProps implements MapWriter {
   }
 
   private MapWriter _allPropsWriter() {
-    BiPredicate<CharSequence, Object> p = dedupeKeyPredicate(new HashSet<>()).and(NON_NULL_VAL);
-    return writer -> {
-      // XXX this is why this class should be immutable - it's a mess !!!
-
-      // propMap takes precedence because it's mutable and we can't control its
-      // contents, so a third party may override some declared fields
+    return w -> {
+      w.putIfNotNull(ReplicaStateProps.CORE_NAME, core)
+          .putIfNotNull(ReplicaStateProps.NODE_NAME, node)
+          .putIfNotNull(ReplicaStateProps.TYPE, type.toString())
+          .putIfNotNull(ReplicaStateProps.STATE, getState().toString().toLowerCase(Locale.ROOT))
+          .putIfNotNull(ReplicaStateProps.LEADER, () -> isLeader() ? "true" : null)
+          .putIfNotNull(
+              ReplicaStateProps.FORCE_SET_STATE, propMap.get(ReplicaStateProps.FORCE_SET_STATE))
+          .putIfNotNull(ReplicaStateProps.BASE_URL, propMap.get(ReplicaStateProps.BASE_URL));
       for (Map.Entry<String, Object> e : propMap.entrySet()) {
-        writer.put(e.getKey(), e.getValue(), p);
+        if (!ReplicaStateProps.WELL_KNOWN_PROPS.contains(e.getKey())) {
+          w.putIfNotNull(e.getKey(), e.getValue());
+        }
       }
-
-      writer
-          .put(ReplicaStateProps.CORE_NAME, core, p)
-          .put(ReplicaStateProps.NODE_NAME, node, p)
-          .put(ReplicaStateProps.TYPE, type.toString(), p)
-          .put(ReplicaStateProps.STATE, shard, p);
     };
   }
 
   @Override
   public void write(JSONWriter jsonWriter) {
-    Map<String, Object> map = new LinkedHashMap<>();
     // this serializes also our declared properties
-    _allPropsWriter().toMap(map);
-    jsonWriter.write(map);
+    jsonWriter.write(_allPropsWriter());
   }
 
   @Override
@@ -437,5 +429,9 @@ public class Replica extends ZkNodeProps implements MapWriter {
     String NODE_NAME = "node_name";
     String BASE_URL = "base_url";
     String PROPERTY_PREFIX = "property.";
+    String FORCE_SET_STATE = "force_set_state";
+    Set<String> WELL_KNOWN_PROPS =
+        Set.of(
+            LEADER, STATE, CORE_NAME, CORE_NODE_NAME, TYPE, NODE_NAME, BASE_URL, FORCE_SET_STATE);
   }
 }
diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java
index e989a7f4b7a..dac1de68a6d 100644
--- a/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java
@@ -187,6 +187,30 @@ public class PerReplicaStatesIntegrationTest extends SolrCloudTestCase {
                 collectionPath, SolrCloudTestCase.cluster.getZkClient(), null);
         PerReplicaStates.State st = prs.get(replicaName);
         assertNotEquals(Replica.State.ACTIVE, st.state);
+        CollectionAdminResponse rsp =
+            new CollectionAdminRequest.ClusterStatus()
+                .setCollectionName(testCollection)
+                .process(cluster.getSolrClient());
+        assertEquals(
+            "true",
+            rsp._get(
+                "cluster/collections/prs_restart_test/shards/shard1/replicas/core_node2/leader",
+                null));
+        assertEquals(
+            "active",
+            rsp._get(
+                "cluster/collections/prs_restart_test/shards/shard1/replicas/core_node2/state",
+                null));
+        assertNull(
+            rsp._get(
+                "cluster/collections/prs_restart_test/shards/shard1/replicas/core_node4/leader",
+                null));
+        assertEquals(
+            "down",
+            rsp._get(
+                "cluster/collections/prs_restart_test/shards/shard1/replicas/core_node4/state",
+                null));
+
         jsr.start();
         cluster.waitForActiveCollection(testCollection, 1, 2);
         prs =
@@ -260,11 +284,6 @@ public class PerReplicaStatesIntegrationTest extends SolrCloudTestCase {
               });
 
     } finally {
-      System.out.println("prs1 : " + original);
-      System.out.println(
-          "prs2 : "
-              + PerReplicaStatesFetcher.fetch(
-                  DocCollection.getCollectionPath(COLL), cluster.getZkClient(), null));
       cluster.shutdown();
     }
   }