Skip to content

Isolation Scheduler Hosts Sorting | Add secondary sort (No of free slots) and tertiary sort (Hostname) #8709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
meetjain74 wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −2
Open

Isolation Scheduler Hosts Sorting | Add secondary sort (No of free slots) and tertiary sort (Hostname) #8709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,12 @@ private Map<String, Set<WorkerSlot>> hostToUsedSlots(Cluster cluster) {
return hostUsedSlots;
}

// returns list of list of slots, reverse sorted by number of slots
// Returns list of hosts with their assignable slots, sorted by:
// 1. (primary) total assignable slots, descending — same as before
// 2. (secondary) currently free slots, descending — prefer hosts that
// need fewer evictions
// 3. (tertiary) host name, ascending — deterministic order
// for testability
private LinkedList<HostAssignableSlots> hostAssignableSlots(Cluster cluster) {
List<WorkerSlot> assignableSlots = cluster.getAssignableSlots();
Map<String, List<WorkerSlot>> hostAssignableSlots = new HashMap<String, List<WorkerSlot>>();
Expand All @@ -316,14 +321,36 @@ private LinkedList<HostAssignableSlots> hostAssignableSlots(Cluster cluster) {
}
slots.add(slot);
}

final Map<String, Integer> hostFreeSlotCount = new HashMap<String, Integer>();
for (WorkerSlot slot : cluster.getAvailableSlots()) {
String host = cluster.getHost(slot.getNodeId());
if (hostAssignableSlots.containsKey(host)) {
Integer count = hostFreeSlotCount.get(host);
hostFreeSlotCount.put(host, (count == null ? 0 : count) + 1);
}
}

List<HostAssignableSlots> sortHostAssignSlots = new ArrayList<HostAssignableSlots>();
for (Map.Entry<String, List<WorkerSlot>> entry : hostAssignableSlots.entrySet()) {
sortHostAssignSlots.add(new HostAssignableSlots(entry.getKey(), entry.getValue()));
}
Collections.sort(sortHostAssignSlots, new Comparator<HostAssignableSlots>() {
@Override
public int compare(HostAssignableSlots o1, HostAssignableSlots o2) {
return o2.getWorkerSlots().size() - o1.getWorkerSlots().size();
int bySlots = o2.getWorkerSlots().size() - o1.getWorkerSlots().size();
if (bySlots != 0) {
return bySlots;
}
int free1 = hostFreeSlotCount.containsKey(o1.getHostName())
? hostFreeSlotCount.get(o1.getHostName()) : 0;
int free2 = hostFreeSlotCount.containsKey(o2.getHostName())
? hostFreeSlotCount.get(o2.getHostName()) : 0;
int byFree = free2 - free1;
if (byFree != 0) {
return byFree;
}
return o1.getHostName().compareTo(o2.getHostName());
}
});

Expand Down
Loading