bipinprasad commented on a change in pull request #3379: URL: https://github.com/apache/storm/pull/3379#discussion_r584026011
########## File path: storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/NodeSorterHostProximity.java ########## @@ -0,0 +1,768 @@ +/* + * 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.storm.scheduler.resource.strategies.scheduling.sorter; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.annotation.Nonnull; +import org.apache.storm.Config; +import org.apache.storm.networktopography.DNSToSwitchMapping; +import org.apache.storm.scheduler.Cluster; +import org.apache.storm.scheduler.ExecutorDetails; +import org.apache.storm.scheduler.SchedulerAssignment; +import org.apache.storm.scheduler.SupervisorDetails; +import org.apache.storm.scheduler.TopologyDetails; +import org.apache.storm.scheduler.WorkerSlot; +import org.apache.storm.scheduler.resource.RasNode; +import org.apache.storm.scheduler.resource.RasNodes; +import org.apache.storm.scheduler.resource.normalization.NormalizedResourceOffer; +import org.apache.storm.scheduler.resource.normalization.NormalizedResourceRequest; +import org.apache.storm.scheduler.resource.strategies.scheduling.BaseResourceAwareStrategy; +import org.apache.storm.scheduler.resource.strategies.scheduling.ObjectResourcesItem; +import org.apache.storm.scheduler.resource.strategies.scheduling.ObjectResourcesSummary; +import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class NodeSorterHostProximity implements INodeSorter { + private static final Logger LOG = LoggerFactory.getLogger(NodeSorterHostProximity.class); + + // instance variables from class instantiation + protected final BaseResourceAwareStrategy.NodeSortType nodeSortType; + + protected Cluster cluster; + protected TopologyDetails topologyDetails; + + // Instance variables derived from Cluster. + private final Map<String, List<String>> networkTopography; + private final Map<String, String> superIdToRack = new HashMap<>(); + private final Map<String, List<RasNode>> hostnameToNodes = new HashMap<>(); + private final Map<String, String> nodeIdToHostname = new HashMap<>(); + private final Map<String, Set<String>> rackIdToHosts; + protected List<String> greyListedSupervisorIds; + + // Instance variables from Cluster and TopologyDetails. + protected List<String> favoredNodeIds; + protected List<String> unFavoredNodeIds; + + // Updated in prepare method + ExecutorDetails exec; + + public NodeSorterHostProximity(Cluster cluster, TopologyDetails topologyDetails) { + this(cluster, topologyDetails, BaseResourceAwareStrategy.NodeSortType.COMMON); + } + + /** + * Initialize for the default implementation node sorting. + * + * <p> + * <li>{@link BaseResourceAwareStrategy.NodeSortType#GENERIC_RAS} sorting implemented in + * {@link #sortObjectResourcesGeneric(ObjectResourcesSummary, ExecutorDetails, NodeSorterHostProximity.ExistingScheduleFunc)}</li> + * <li>{@link BaseResourceAwareStrategy.NodeSortType#DEFAULT_RAS} sorting implemented in + * {@link #sortObjectResourcesDefault(ObjectResourcesSummary, NodeSorterHostProximity.ExistingScheduleFunc)}</li> + * <li>{@link BaseResourceAwareStrategy.NodeSortType#COMMON} sorting implemented in + * {@link #sortObjectResourcesCommon(ObjectResourcesSummary, ExecutorDetails, NodeSorterHostProximity.ExistingScheduleFunc)}</li> + * </p> + * + * @param cluster for which nodes will be sorted. + * @param topologyDetails the topology to sort for. + * @param nodeSortType type of sorting to be applied to object resource collection {@link BaseResourceAwareStrategy.NodeSortType}. + */ + public NodeSorterHostProximity(Cluster cluster, TopologyDetails topologyDetails, BaseResourceAwareStrategy.NodeSortType nodeSortType) { + this.cluster = cluster; + this.topologyDetails = topologyDetails; + this.nodeSortType = nodeSortType; + + // from Cluster + networkTopography = cluster.getNetworkTopography(); + greyListedSupervisorIds = cluster.getGreyListedSupervisors(); + Map<String, String> hostToRack = cluster.getHostToRack(); + RasNodes nodes = new RasNodes(cluster); + for (RasNode node: nodes.getNodes()) { + String superId = node.getId(); + String hostName = node.getHostname(); + if (hostName == null) { + // ignore supervisors on blacklistedHosts + continue; + } + String rackId = hostToRack.getOrDefault(hostName, DNSToSwitchMapping.DEFAULT_RACK); + superIdToRack.put(superId, rackId); + hostnameToNodes.computeIfAbsent(hostName, (hn) -> new ArrayList<>()).add(node); + nodeIdToHostname.put(superId, hostName); + } + rackIdToHosts = computeRackToHosts(cluster, superIdToRack); + + // from TopologyDetails + Map<String, Object> topoConf = topologyDetails.getConf(); + + // From Cluster and TopologyDetails - and cleaned-up + favoredNodeIds = makeHostToNodeIds((List<String>) topoConf.get(Config.TOPOLOGY_SCHEDULER_FAVORED_NODES)); + unFavoredNodeIds = makeHostToNodeIds((List<String>) topoConf.get(Config.TOPOLOGY_SCHEDULER_UNFAVORED_NODES)); + favoredNodeIds.removeAll(greyListedSupervisorIds); + unFavoredNodeIds.removeAll(greyListedSupervisorIds); + unFavoredNodeIds.removeAll(favoredNodeIds); + } + + @VisibleForTesting + public Map<String, Set<String>> getRackIdToHosts() { + return rackIdToHosts; + } + + @Override + public void prepare(ExecutorDetails exec) { + this.exec = exec; + } + + /** + * Get a key corresponding to this executor resource request. The key contains all non-zero resources requested by + * the executor. + * + * <p>This key can be used to retrieve pre-sorted list of racks/hosts/nodes. So executors with similar set of + * rare resource request will be reuse the same cached list instead of creating a new sorted list of nodes.</p> + * + * @param exec executor whose requested resources are being examined. + * @return a set of resource names that have values greater that zero. + */ + public Set<String> getExecRequestKey(@Nonnull ExecutorDetails exec) { Review comment: Now that TestLargeCluster tests multiple clusters, I wish it were faster. But not in this PR. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
