Github user vesense commented on a diff in the pull request:

    https://github.com/apache/storm/pull/1108#discussion_r53121665
  
    --- Diff: storm-core/src/jvm/org/apache/storm/scheduler/EvenScheduler.java 
---
    @@ -0,0 +1,177 @@
    +/**
    + * 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;
    +
    +import java.util.ArrayList;
    +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.Map.Entry;
    +import java.util.Set;
    +import java.util.TreeMap;
    +
    +import org.apache.storm.utils.Utils;
    +import org.slf4j.Logger;
    +import org.slf4j.LoggerFactory;
    +
    +import com.google.common.collect.Sets;
    +
    +public class EvenScheduler implements IScheduler {
    +    private static final Logger LOG = 
LoggerFactory.getLogger(EvenScheduler.class);
    +
    +    public static List<WorkerSlot> sortSlots(List<WorkerSlot> 
availableSlots, Cluster cluster) {
    +        if (availableSlots != null && availableSlots.size() > 0) {
    +            // group by node
    +            Map<String, List<WorkerSlot>> slotGroups = new TreeMap<String, 
List<WorkerSlot>>();
    +            for (WorkerSlot slot : availableSlots) {
    +                String host = cluster.getHost(slot.getNodeId());
    +                List<WorkerSlot> slots = slotGroups.get(host);
    +                if (slots == null) {
    +                    slots = new ArrayList<WorkerSlot>();
    +                    slotGroups.put(host, slots);
    +                }
    +                slots.add(slot);
    +            }
    +
    +            // sort by port
    +            for (List<WorkerSlot> slots : slotGroups.values()) {
    +                Collections.sort(slots, new Comparator<WorkerSlot>() {
    +                    @Override
    +                    public int compare(WorkerSlot o1, WorkerSlot o2) {
    +                        return o1.getPort() - o2.getPort();
    +                    }
    +                });
    +            }
    +
    +            // sort by count
    +            List<List<WorkerSlot>> list = new 
ArrayList<List<WorkerSlot>>(slotGroups.values());
    +            Collections.sort(list, new Comparator<List<WorkerSlot>>() {
    +                @Override
    +                public int compare(List<WorkerSlot> o1, List<WorkerSlot> 
o2) {
    +                    return o2.size() - o1.size();
    +                }
    +            });
    +
    +            return Utils.interleaveAll(list);
    +        }
    +
    +        return null;
    +    }
    +
    +    public static Map<WorkerSlot, List<ExecutorDetails>> 
getAliveAssignedWorkerSlotExecutors(Cluster cluster, String topologyId) {
    +        SchedulerAssignment existingAssignment = 
cluster.getAssignmentById(topologyId);
    +        Map<ExecutorDetails, WorkerSlot> executorToSlot = null;
    +        if (existingAssignment != null) {
    +            executorToSlot = existingAssignment.getExecutorToSlot();
    +        }
    +
    +        Map<WorkerSlot, List<ExecutorDetails>> result = new 
HashMap<WorkerSlot, List<ExecutorDetails>>();
    +        if (executorToSlot != null) {
    +            for (Entry<ExecutorDetails, WorkerSlot> entry : 
executorToSlot.entrySet()) {
    +                List<ExecutorDetails> list = result.get(entry.getValue());
    +                if (list == null) {
    +                    list = new ArrayList<ExecutorDetails>();
    +                    result.put(entry.getValue(), list);
    +                }
    +                list.add(entry.getKey());
    +            }
    +        }
    +        return result;
    +    }
    +
    +    private static Map<ExecutorDetails, WorkerSlot> 
scheduleTopology(TopologyDetails topology, Cluster cluster) {
    +        List<WorkerSlot> availableSlots = cluster.getAvailableSlots();
    +        Set<ExecutorDetails> allExecutors = (Set<ExecutorDetails>) 
topology.getExecutors();
    +        Map<WorkerSlot, List<ExecutorDetails>> aliveAssigned = 
getAliveAssignedWorkerSlotExecutors(cluster, topology.getId());
    +        int totalSlotsToUse = Math.min(topology.getNumWorkers(), 
availableSlots.size() + aliveAssigned.size());
    +
    +        List<WorkerSlot> sortedList = sortSlots(availableSlots, cluster);
    +        if (sortedList == null) {
    +            LOG.error("Available slots are not enough for topology: {}", 
topology.getName());
    +            return new HashMap<ExecutorDetails, WorkerSlot>();
    +        }
    +
    +        List<WorkerSlot> reassignSlots = sortedList.subList(0, 
totalSlotsToUse - aliveAssigned.size());
    +        Set<ExecutorDetails> aliveExecutors = new 
HashSet<ExecutorDetails>();
    +        for (List<ExecutorDetails> list : aliveAssigned.values()) {
    +            aliveExecutors.addAll(list);
    +        }
    +        Set<ExecutorDetails> reassignExecutors = 
Sets.difference(allExecutors, aliveExecutors);
    +
    +        Map<ExecutorDetails, WorkerSlot> reassignment = new 
HashMap<ExecutorDetails, WorkerSlot>();
    +        if (reassignSlots.size() == 0) {
    +            return reassignment;
    +        }
    +
    +        List<ExecutorDetails> _executors = new 
ArrayList<ExecutorDetails>(reassignExecutors);
    +        Collections.sort(_executors, new Comparator<ExecutorDetails>() {
    +            @Override
    +            public int compare(ExecutorDetails o1, ExecutorDetails o2) {
    +                return o1.getStartTask() - o2.getStartTask();
    +            }
    +        });
    +
    +        int numExecutors = _executors.size();
    --- End diff --
    
    OK


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to