HoustonPutman commented on code in PR #1650: URL: https://github.com/apache/solr/pull/1650#discussion_r1226875203
########## solr/core/src/java/org/apache/solr/cluster/placement/plugins/OrderedNodePlacementPlugin.java: ########## @@ -0,0 +1,604 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.solr.cluster.placement.plugins; + +import java.lang.invoke.MethodHandles; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.PriorityQueue; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.IntSupplier; +import java.util.stream.Collectors; +import org.apache.solr.cluster.Node; +import org.apache.solr.cluster.Replica; +import org.apache.solr.cluster.Shard; +import org.apache.solr.cluster.SolrCollection; +import org.apache.solr.cluster.placement.BalancePlan; +import org.apache.solr.cluster.placement.BalanceRequest; +import org.apache.solr.cluster.placement.DeleteCollectionRequest; +import org.apache.solr.cluster.placement.DeleteReplicasRequest; +import org.apache.solr.cluster.placement.DeleteShardsRequest; +import org.apache.solr.cluster.placement.ModificationRequest; +import org.apache.solr.cluster.placement.PlacementContext; +import org.apache.solr.cluster.placement.PlacementException; +import org.apache.solr.cluster.placement.PlacementModificationException; +import org.apache.solr.cluster.placement.PlacementPlan; +import org.apache.solr.cluster.placement.PlacementPlugin; +import org.apache.solr.cluster.placement.PlacementRequest; +import org.apache.solr.cluster.placement.ReplicaPlacement; +import org.apache.solr.common.util.CollectionUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class OrderedNodePlacementPlugin implements PlacementPlugin { + private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + @Override + public List<PlacementPlan> computePlacements( + Collection<PlacementRequest> requests, PlacementContext placementContext) + throws PlacementException { + List<PlacementPlan> placementPlans = new ArrayList<>(requests.size()); + Set<Node> allNodes = new HashSet<>(); + Set<SolrCollection> allCollections = new HashSet<>(); + for (PlacementRequest request : requests) { + allNodes.addAll(request.getTargetNodes()); + allCollections.add(request.getCollection()); + } + Collection<WeightedNode> weightedNodes = + getWeightedNodes(placementContext, allNodes, allCollections, true).values(); + for (PlacementRequest request : requests) { + int totalReplicasPerShard = 0; + for (Replica.ReplicaType rt : Replica.ReplicaType.values()) { + totalReplicasPerShard += request.getCountReplicasToCreate(rt); + } + + List<WeightedNode> nodesForRequest = + weightedNodes.stream() + .filter(wn -> request.getTargetNodes().contains(wn.getNode())) + .collect(Collectors.toList()); + + Set<ReplicaPlacement> replicaPlacements = + CollectionUtil.newHashSet(totalReplicasPerShard * request.getShardNames().size()); + + SolrCollection solrCollection = request.getCollection(); + // Now place randomly all replicas of all shards on available nodes + for (String shardName : request.getShardNames()) { + for (Replica.ReplicaType replicaType : Replica.ReplicaType.values()) { + int replicaCount = request.getCountReplicasToCreate(replicaType); + if (replicaCount == 0) { + continue; + } + if (log.isDebugEnabled()) { + log.debug( + "Placing replicas for Collection: {}, Shard: {}, ReplicaType: {}", + solrCollection.getName(), + shardName, + replicaType); + } + Replica pr = + PlacementPlugin.createProjectedReplica(solrCollection, shardName, replicaType, null); + PriorityQueue<WeightedNode> nodesForReplicaType = new PriorityQueue<>(); + nodesForRequest.stream() + .filter(n -> n.canAddReplica(pr)) + .forEach( + n -> { + n.sortByRelevantWeightWithReplica(pr); + n.addToSortedCollection(nodesForReplicaType); + }); + + int replicasPlaced = 0; + while (!nodesForReplicaType.isEmpty() && replicasPlaced < replicaCount) { + WeightedNode node = nodesForReplicaType.poll(); + if (!node.canAddReplica(pr)) { + if (log.isDebugEnabled()) { + log.debug( + "Node can no longer accept replica, removing from selection list: {}", + node.getNode()); + } + continue; + } + if (node.hasWeightChangedSinceSort()) { + if (log.isDebugEnabled()) { + log.debug( + "Node's sort is out-of-date, adding back to selection list: {}", + node.getNode()); + } + node.addToSortedCollection(nodesForReplicaType); + // The node will be re-sorted, + // so go back to the top of the loop to get the new lowest-sorted node + continue; + } + if (log.isDebugEnabled()) { + log.debug("Node chosen to host replica: {}", node.getNode()); + } + + boolean needsToResortAll = + node.addReplica( + PlacementPlugin.createProjectedReplica( + solrCollection, shardName, replicaType, node.getNode())); + replicasPlaced += 1; + replicaPlacements.add( + placementContext + .getPlacementPlanFactory() + .createReplicaPlacement( + solrCollection, shardName, node.getNode(), replicaType)); + // Only update the priorityQueue if there are still replicas to be placed + if (replicasPlaced < replicaCount) { + if (needsToResortAll) { + if (log.isDebugEnabled()) { + log.debug("Replica addition requires re-sorting of entire selection list"); + } + List<WeightedNode> nodeList = new ArrayList<>(nodesForReplicaType); + nodesForReplicaType.clear(); + nodeList.forEach(n -> n.addToSortedCollection(nodesForReplicaType)); + } + // Add the chosen node back to the list if it can accept another replica of the + // shard/replicaType. + // The default implementation of "canAddReplica()" returns false for replicas + // of shards that the node already contains, so this will usually be false. + if (node.canAddReplica(pr)) { + nodesForReplicaType.add(node); + } + } + } + + if (replicasPlaced < replicaCount) { + throw new PlacementException( + String.format( + Locale.ROOT, + "Not enough eligible nodes to place %d replica(s) of type %s for shard %s of collection %s. Only able to place %d replicas.", + replicaCount, + replicaType, + shardName, + solrCollection.getName(), + replicasPlaced)); + } + } + } + + placementPlans.add( + placementContext + .getPlacementPlanFactory() + .createPlacementPlan(request, replicaPlacements)); + } + return placementPlans; + } + + @Override + public BalancePlan computeBalancing( + BalanceRequest balanceRequest, PlacementContext placementContext) throws PlacementException { + Map<Replica, Node> replicaMovements = new HashMap<>(); + TreeSet<WeightedNode> orderedNodes = new TreeSet<>(); + Collection<WeightedNode> weightedNodes = + getWeightedNodes( + placementContext, + balanceRequest.getNodes(), + placementContext.getCluster().collections(), + true) + .values(); + // This is critical to store the last sort weight for this node + weightedNodes.forEach( + node -> { + node.sortWithoutChanges(); + node.addToSortedCollection(orderedNodes); + }); + + // While the node with the least cores still has room to take a replica from the node with the + // most cores, loop Review Comment: Yeah good catch, this was originally just implemented for minimizeCores, but got generalized when things moved to "weights" -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
