bipinprasad commented on a change in pull request #3379: URL: https://github.com/apache/storm/pull/3379#discussion_r593427347
########## File path: storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/TestNodeSorterHostProximity.java ########## @@ -0,0 +1,1054 @@ +/* + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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 org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; +import org.apache.storm.Config; +import org.apache.storm.metric.StormMetricsRegistry; +import org.apache.storm.networktopography.DNSToSwitchMapping; +import org.apache.storm.scheduler.Cluster; +import org.apache.storm.scheduler.ExecutorDetails; +import org.apache.storm.scheduler.INimbus; +import org.apache.storm.scheduler.IScheduler; +import org.apache.storm.scheduler.SchedulerAssignment; +import org.apache.storm.scheduler.SupervisorDetails; +import org.apache.storm.scheduler.Topologies; +import org.apache.storm.scheduler.TopologyDetails; +import org.apache.storm.scheduler.WorkerSlot; +import org.apache.storm.scheduler.resource.RasNodes; +import org.apache.storm.scheduler.resource.ResourceAwareScheduler; +import org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler; +import org.apache.storm.scheduler.resource.normalization.NormalizedResourceRequest; +import org.apache.storm.scheduler.resource.normalization.NormalizedResourcesExtension; +import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; +import org.apache.storm.scheduler.resource.strategies.scheduling.BaseResourceAwareStrategy; +import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategy; +import org.apache.storm.scheduler.resource.strategies.scheduling.GenericResourceAwareStrategy; +import org.apache.storm.scheduler.resource.strategies.scheduling.ObjectResourcesItem; +import org.apache.storm.topology.TopologyBuilder; +import org.junit.Assert; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +@ExtendWith({NormalizedResourcesExtension.class}) +public class TestNodeSorterHostProximity { + private static final Logger LOG = LoggerFactory.getLogger(TestNodeSorterHostProximity.class); + private static final int CURRENT_TIME = 1450418597; + + protected Class getDefaultResourceAwareStrategyClass() { + return DefaultResourceAwareStrategy.class; + } + + private Config createClusterConfig(double compPcore, double compOnHeap, double compOffHeap, + Map<String, Map<String, Number>> pools) { + Config config = TestUtilsForResourceAwareScheduler.createClusterConfig(compPcore, compOnHeap, compOffHeap, pools); + config.put(Config.TOPOLOGY_SCHEDULER_STRATEGY, getDefaultResourceAwareStrategyClass().getName()); + return config; + } + + private static class TestDNSToSwitchMapping implements DNSToSwitchMapping { + private final Map<String, String> hostToRackMap; + private final Map<String, List<String>> rackToHosts; + + @SafeVarargs + public TestDNSToSwitchMapping(Map<String, SupervisorDetails>... racks) { + Set<String> seenHosts = new HashSet<>(); + Map<String, String> hostToRackMap = new HashMap<>(); + Map<String, List<String>> rackToHosts = new HashMap<>(); + for (int rackNum = 0; rackNum < racks.length; rackNum++) { + String rack = String.format("rack-%03d", rackNum); + for (SupervisorDetails sup : racks[rackNum].values()) { + hostToRackMap.put(sup.getHost(), rack); + String host = sup.getHost(); + if (!seenHosts.contains(host)) { + rackToHosts.computeIfAbsent(rack, rid -> new ArrayList<>()).add(host); + seenHosts.add(host); + } + } + } + this.hostToRackMap = Collections.unmodifiableMap(hostToRackMap); + this.rackToHosts = Collections.unmodifiableMap(rackToHosts); + } + + /** + * Use the "rack-%03d" embedded in the name of the supervisor to determine the rack number. + * + * @param supervisorDetailsCollection + */ + public TestDNSToSwitchMapping(Collection<SupervisorDetails> supervisorDetailsCollection) { + Set<String> seenHosts = new HashSet<>(); + Map<String, String> hostToRackMap = new HashMap<>(); + Map<String, List<String>> rackToHosts = new HashMap<>(); + + for (SupervisorDetails supervisorDetails: supervisorDetailsCollection) { + String rackId = supervisorIdToRackName(supervisorDetails.getId()); + hostToRackMap.put(supervisorDetails.getHost(), rackId); + String host = supervisorDetails.getHost(); + if (!seenHosts.contains(host)) { + rackToHosts.computeIfAbsent(rackId, rid -> new ArrayList<>()).add(host); + seenHosts.add(host); + } + } + this.hostToRackMap = Collections.unmodifiableMap(hostToRackMap); + this.rackToHosts = Collections.unmodifiableMap(rackToHosts); + } + + @Override + public Map<String, String> resolve(List<String> names) { + return hostToRackMap; + } + + public Map<String, List<String>> getRackToHosts() { + return rackToHosts; + } + } + + /** + * Test whether strategy will choose correct rack. + */ + @Test + public void testMultipleRacks() { + final Map<String, SupervisorDetails> supMap = new HashMap<>(); + final int numRacks = 1; + final int numSupersPerRack = 10; + final int numPortsPerSuper = 4; + final int numZonesPerHost = 1; + final double numaResourceMultiplier = 1.0; + int rackStartNum = 0; + int supStartNum = 0; + + final Map<String, SupervisorDetails> supMapRack0 = genSupervisorsWithRacksAndNuma( + numRacks, numSupersPerRack, numZonesPerHost, numPortsPerSuper, rackStartNum++, supStartNum, + 400, 8000, Collections.emptyMap(), numaResourceMultiplier); + + //generate another rack of supervisors with less resources + supStartNum += numSupersPerRack; + final Map<String, SupervisorDetails> supMapRack1 = genSupervisorsWithRacksAndNuma( + numRacks, numSupersPerRack, numZonesPerHost, numPortsPerSuper, rackStartNum++, supStartNum, + 200, 4000, Collections.emptyMap(), numaResourceMultiplier); + + //generate some supervisors that are depleted of one resource + supStartNum += numSupersPerRack; + final Map<String, SupervisorDetails> supMapRack2 = genSupervisorsWithRacksAndNuma( + numRacks, numSupersPerRack, numZonesPerHost, numPortsPerSuper, rackStartNum++, supStartNum, + 0, 8000, Collections.emptyMap(), numaResourceMultiplier); + + //generate some that has a lot of memory but little of cpu + supStartNum += numSupersPerRack; + final Map<String, SupervisorDetails> supMapRack3 = genSupervisorsWithRacksAndNuma( + numRacks, numSupersPerRack, numZonesPerHost, numPortsPerSuper, rackStartNum++, supStartNum, + 10, 8000 * 2 + 4000, Collections.emptyMap(),numaResourceMultiplier); + + //generate some that has a lot of cpu but little of memory + supStartNum += numSupersPerRack; + final Map<String, SupervisorDetails> supMapRack4 = genSupervisorsWithRacksAndNuma( + numRacks, numSupersPerRack, numZonesPerHost, numPortsPerSuper, rackStartNum++, supStartNum, + 400 + 200 + 10, 1000, Collections.emptyMap(), numaResourceMultiplier); + + //Generate some that have neither resource, to verify that the strategy will prioritize this last + //Also put a generic resource with 0 value in the resources list, to verify that it doesn't affect the sorting + supStartNum += numSupersPerRack; + final Map<String, SupervisorDetails> supMapRack5 = genSupervisorsWithRacksAndNuma( + numRacks, numSupersPerRack, numZonesPerHost, numPortsPerSuper, rackStartNum++, supStartNum, + 0.0, 0.0, Collections.singletonMap("gpu.count", 0.0), numaResourceMultiplier); + + supMap.putAll(supMapRack0); + supMap.putAll(supMapRack1); + supMap.putAll(supMapRack2); + supMap.putAll(supMapRack3); + supMap.putAll(supMapRack4); + supMap.putAll(supMapRack5); + + Config config = createClusterConfig(100, 500, 500, null); + config.put(Config.TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB, Double.MAX_VALUE); + INimbus iNimbus = new INimbusTest(); + + //create test DNSToSwitchMapping plugin + TestDNSToSwitchMapping testDNSToSwitchMapping = + new TestDNSToSwitchMapping(supMapRack0, supMapRack1, supMapRack2, supMapRack3, supMapRack4, supMapRack5); + + //generate topologies + TopologyDetails topo1 = genTopology("topo-1", config, 8, 0, 2, 0, CURRENT_TIME - 2, 10, "user"); + TopologyDetails topo2 = genTopology("topo-2", config, 8, 0, 2, 0, CURRENT_TIME - 2, 10, "user"); + + Topologies topologies = new Topologies(topo1, topo2); + Cluster cluster = new Cluster(iNimbus, new ResourceMetrics(new StormMetricsRegistry()), supMap, new HashMap<>(), topologies, config); + + List<String> supHostnames = new LinkedList<>(); + for (SupervisorDetails sup : supMap.values()) { + supHostnames.add(sup.getHost()); + } + Map<String, List<String>> rackToHosts = testDNSToSwitchMapping.getRackToHosts(); + cluster.setNetworkTopography(rackToHosts); + System.out.println("DEBUG: rackToHosts: " + rackToHosts.toString()); Review comment: removed. ---------------------------------------------------------------- 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
