qizhu-lucas commented on a change in pull request #2494:
URL: https://github.com/apache/hadoop/pull/2494#discussion_r533865786
##########
File path:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
##########
@@ -544,44 +544,73 @@ static void schedule(CapacityScheduler cs) throws
InterruptedException{
if(nodeSize == 0) {
return;
}
- int start = random.nextInt(nodeSize);
+ if (!cs.multiNodePlacementEnabled) {
+ // First randomize the start point
+ int current = 0;
+ int start = random.nextInt(nodeSize);
- // To avoid too verbose DEBUG logging, only print debug log once for
- // every 10 secs.
- boolean printSkipedNodeLogging = false;
- if (Time.monotonicNow() / 1000 % 10 == 0) {
- printSkipedNodeLogging = (!printedVerboseLoggingForAsyncScheduling);
- } else {
- printedVerboseLoggingForAsyncScheduling = false;
- }
+ // To avoid too verbose DEBUG logging, only print debug log once for
+ // every 10 secs.
+ boolean printSkipedNodeLogging = false;
+ if (Time.monotonicNow() / 1000 % 10 == 0) {
+ printSkipedNodeLogging = (!printedVerboseLoggingForAsyncScheduling);
+ } else {
+ printedVerboseLoggingForAsyncScheduling = false;
+ }
+
+ // Allocate containers of node [start, end)
+ for (FiCaSchedulerNode node : nodes) {
+ if (current++ >= start) {
+ if (shouldSkipNodeSchedule(node, cs, printSkipedNodeLogging)) {
+ continue;
+ }
+ cs.allocateContainersToNode(node.getNodeID(), false);
+ }
+ }
- // Allocate containers of node [start, end)
- for (FiCaSchedulerNode node : nodes) {
- if (current++ >= start) {
+ current = 0;
+
+ // Allocate containers of node [0, start)
+ for (FiCaSchedulerNode node : nodes) {
+ if (current++ > start) {
+ break;
+ }
if (shouldSkipNodeSchedule(node, cs, printSkipedNodeLogging)) {
continue;
}
cs.allocateContainersToNode(node.getNodeID(), false);
}
- }
-
- current = 0;
- // Allocate containers of node [0, start)
- for (FiCaSchedulerNode node : nodes) {
- if (current++ > start) {
- break;
+ if (printSkipedNodeLogging) {
+ printedVerboseLoggingForAsyncScheduling = true;
}
- if (shouldSkipNodeSchedule(node, cs, printSkipedNodeLogging)) {
- continue;
+ } else {
+ //Get all partitions
+ List<String> partitions = cs.nodeTracker.getPartitions();
+ int partitionSize = partitions.size();
+ // First randomize the start point
+ int start = random.nextInt(partitionSize);
+ int current = 0;
+ // Allocate containers of partition [start, end)
+ for (String partititon : partitions) {
+ if (current++ >= start) {
+ cs.allocateContainersToNode(cs.getCandidateNodeSet(partititon),
Review comment:
Fixed it.
----------------------------------------------------------------
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:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
