Apache Solr open-source search software
Small code fixes to Placement Plugins (#4213)
Eric Pugh8c64932f0e9b
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementConfig.java b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementConfig.javaindex addbb94b3f7..ae285dcacb2 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementConfig.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementConfig.java@@ -40,14 +40,14 @@ public class AffinityPlacementConfig implements PlacementPluginConfig {** <p>Nodes on which this system property is not defined are considered being in the same* Availability Zone {@link #UNDEFINED_AVAILABILITY_ZONE} (hopefully the value of this constant is- * not the name of a real Availability Zone :).+ * not the name of a real Availability Zone).*/public static final String AVAILABILITY_ZONE_SYSPROP = "availability_zone";/*** Name of the system property on a node indicating the type of replicas allowed on that node. The* value of that system property is a comma separated list or a single string of value names of- * {@link org.apache.solr.cluster.Replica.ReplicaType} (case insensitive). If that property is not+ * {@link org.apache.solr.cluster.Replica.ReplicaType} (case-insensitive). If that property is not* defined, that node is considered accepting all replica types (i.e. undefined is equivalent to* {@code "NRT,Pull,tlog"}).*/@@ -136,8 +136,8 @@ public class AffinityPlacementConfig implements PlacementPluginConfig {/*** Determines the maximum number of replicas of a particular type of a particular shard that can- * be placed within a single domain (as defined by the @link #SPREAD_DOMAIN_SYSPROP} System- * property.+ * be placed within a single domain (as defined by the {@link #SPREAD_DOMAIN_SYSPROP} System+ * property).*/@JsonProperty public Integer maxReplicasPerShardInDomain = -1;@@ -163,7 +163,7 @@ public class AffinityPlacementConfig implements PlacementPluginConfig {* @param prioritizedFreeDiskGB prioritized free disk GB.* @param withCollection configuration of co-located collections: keys are primary collection* names and values are secondary collection names.- * @param collectionNodeType configuration of reequired node types per collection. Keys are+ * @param collectionNodeType configuration of required node types per collection. Keys are* collection names and values are comma-separated lists of required node types.*/public AffinityPlacementConfig(diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactory.java b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactory.javaindex 6c339aa7094..12f86137e5d 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactory.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactory.java@@ -77,8 +77,8 @@ import org.slf4j.LoggerFactory;* }' http://localhost:8983/api/cluster/plugin* </pre>*- * <p>In order to delete the placement-plugin section (and to fallback to either Legacy or rule- * based placement if configured for a collection), execute:+ * <p>In order to delete the placement-plugin section (and fallback to either Legacy or rule based+ * placement if configured for a collection), execute:** <pre>*@@ -295,7 +295,7 @@ public class AffinityPlacementFactory implements PlacementPluginFactory<Affinity}}- // If there are not multiple spreadDomains, then there is nothing to spread across+ // only spread across if there are multiple spreadDomainsif (affinityPlacementContext.allSpreadDomains.size() < 2) {affinityPlacementContext.doSpreadAcrossDomains = false;}@@ -307,8 +307,7 @@ public class AffinityPlacementFactory implements PlacementPluginFactory<AffinityNode node,AttributeValues attrValues,AffinityPlacementContext affinityPlacementContext,- boolean skipNodesWithErrors)- throws PlacementException {+ boolean skipNodesWithErrors) {Set<Replica.ReplicaType> supportedReplicaTypes =attrValues.getSystemProperty(node, AffinityPlacementConfig.REPLICA_TYPE_SYSPROP).stream().flatMap(s -> Arrays.stream(s.split(",")))diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/OrderedNodePlacementPlugin.java b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/OrderedNodePlacementPlugin.javaindex a353b9dd5e2..9d2741315fa 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/OrderedNodePlacementPlugin.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/OrderedNodePlacementPlugin.java@@ -93,7 +93,7 @@ public abstract class OrderedNodePlacementPlugin implements PlacementPlugin {}List<WeightedNode> nodesForRequest =- weightedNodes.stream().filter(request::isTargetingNode).collect(Collectors.toList());+ weightedNodes.stream().filter(request::isTargetingNode).toList();SolrCollection solrCollection = request.getCollection();// Now place all replicas of all shards on available nodes@@ -241,7 +241,7 @@ public abstract class OrderedNodePlacementPlugin implements PlacementPlugin {List<Replica> availableReplicasToMove =highestWeight.getAllReplicasOnNode().stream().sorted(Comparator.comparing(Replica::getReplicaName))- .collect(Collectors.toList());+ .toList();int combinedNodeWeights = highestWeight.calcWeight() + lowestWeight.calcWeight();for (Replica r : availableReplicasToMove) {// Only continue if the replica can be removed from the old node and moved to the new node@@ -284,7 +284,7 @@ public abstract class OrderedNodePlacementPlugin implements PlacementPlugin {break;}}- // For now we do not have any way to see if there are out-of-date notes in the middle of the+ // For now, we do not have any way to see if there are out-of-date nodes in the middle of the// TreeSet. Therefore, we need to re-sort this list after every selection. In the future, we// should find a way to re-sort the out-of-date nodes without having to sort all nodes.traversedHighNodes.addAll(orderedNodes);@@ -442,12 +442,6 @@ public abstract class OrderedNodePlacementPlugin implements PlacementPlugin {return replicas.getOrDefault(collection, Collections.emptyMap()).keySet();}- public boolean hasShardOnNode(Shard shard) {- return replicas- .getOrDefault(shard.getCollection().getName(), Collections.emptyMap())- .containsKey(shard.getShardName());- }-public Set<Replica> getReplicasForShardOnNode(Shard shard) {return Optional.ofNullable(replicas.get(shard.getCollection().getName())).map(m -> m.get(shard.getShardName()))@@ -775,15 +769,6 @@ public abstract class OrderedNodePlacementPlugin implements PlacementPlugin {}}- /**- * Get the number of nodes in the heap.- *- * @return number of nodes- */- public int size() {- return size;- }-/*** Check if the heap is empty.*diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.javaindex 0b2279b34fa..8a16d1af438 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java@@ -31,7 +31,7 @@ import org.apache.solr.cluster.placement.PlacementPluginFactory;/*** Factory for creating {@link RandomPlacementPlugin}, a placement plugin implementing random* placement for new collection creation while preventing two replicas of same shard from being- * placed on same node..+ * placed on same node.** <p>See {@link RandomNode} for information on how this PlacementFactory weights nodes.*diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.javaindex ad0999fc6cf..eaa1b0a0976 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java@@ -748,7 +748,6 @@ public class AffinityPlacementFactoryTest extends AbstractPlacementFactoryTest {int NUM_NODES = 3;Builders.ClusterBuilder clusterBuilder =Builders.newClusterBuilder().initializeLiveNodes(NUM_NODES);- Node smallNode = null;for (int i = 0; i < NUM_NODES; i++) {Builders.NodeBuilder nodeBuilder = clusterBuilder.getLiveNodeBuilders().get(i);// Act as if the two replicas were placed on nodes 1 and 2