[lucene] 16/17: SOLR-15019: Minor cleanups after review.

[dw...@apache.org]

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

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

commit e5dc7bf0988279b11f302f8448307e476fae89c8
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Jan 4 13:41:35 2021 +0100

    SOLR-15019: Minor cleanups after review.
---
 .../src/java/org/apache/solr/cluster/placement/AttributeFetcher.java  | 2 +-
 solr/core/src/java/org/apache/solr/cluster/placement/Metric.java      | 4 ++--
 solr/core/src/java/org/apache/solr/cluster/placement/NodeMetric.java  | 2 +-
 .../apache/solr/cluster/placement/impl/CollectionMetricsBuilder.java  | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.java b/solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.java
index 5502c47..ae2afc7 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.java
@@ -46,7 +46,7 @@ public interface AttributeFetcher {
 
   /**
    * Request collection-level metrics. To get the values use {@link AttributeValues#getCollectionMetrics(String)}.
-   * Note that this request will fetch information from nodes relevant to the collection
+   * Note that this request will fetch information from nodes that are relevant to the collection
    * replicas and not the ones specified in {@link #fetchFrom(Set)} (though they may overlap).
    * @param solrCollection request metrics for this collection
    * @param metrics metrics to retrieve (see {@link ReplicaMetric})
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/Metric.java b/solr/core/src/java/org/apache/solr/cluster/placement/Metric.java
index a29abde..b5ba496 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/Metric.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/Metric.java
@@ -19,7 +19,7 @@ package org.apache.solr.cluster.placement;
 /**
  * Metric-related attribute of a node or replica. It defines a short symbolic name of the metric, the corresponding
  * internal metric name and the desired format/unit conversion. Generic type
- * defines the type of converted values of this attribute.
+ * specifies the type of converted values of this attribute.
  */
 public interface Metric<T> {
 
@@ -34,7 +34,7 @@ public interface Metric<T> {
   String getInternalName();
 
   /**
-   * Convert raw value. This may involve changing value type or units.
+   * Convert raw value. This may involve changing raw value type or units.
    * @param value raw value
    * @return converted value
    */
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/NodeMetric.java b/solr/core/src/java/org/apache/solr/cluster/placement/NodeMetric.java
index f9eb65c..14436ba 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/NodeMetric.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/NodeMetric.java
@@ -25,7 +25,7 @@ public interface NodeMetric<T> extends Metric<T> {
 
   /**
    * Metric registry. If this metric identifier uses a fully-qualified
-   * metric key instead, then this method will return null.
+   * metric key instead, then this method will return {@link Registry#UNSPECIFIED}.
    */
   Registry getRegistry();
 
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/impl/CollectionMetricsBuilder.java b/solr/core/src/java/org/apache/solr/cluster/placement/impl/CollectionMetricsBuilder.java
index 2aeec59..f8ea0cb 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/impl/CollectionMetricsBuilder.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/impl/CollectionMetricsBuilder.java
@@ -83,6 +83,9 @@ public class CollectionMetricsBuilder {
         if (replicaBuilder.leader) {
           if (leaderMetricsBuilder == null) {
             leaderMetricsBuilder = replicaBuilder;
+          } else if (!leaderMetricsBuilder.replicaName.equals(replicaBuilder.replicaName)) {
+            throw new RuntimeException("two replicas claim to be the shard leader! existing=" +
+                leaderMetricsBuilder + " and current " + replicaBuilder);
           }
         }
       });