diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/AlignedPlannerWithGreedy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/AlignedPlannerWithGreedy.java index 3853f41..eb00fc0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/AlignedPlannerWithGreedy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/AlignedPlannerWithGreedy.java @@ -18,8 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.reservation.planning; -import java.util.LinkedList; -import java.util.List; +import java.util.Arrays; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.api.records.ReservationDefinition; @@ -61,27 +60,20 @@ public void init(Configuration conf) { allocateLeft = conf.getBoolean(FAVOR_EARLY_ALLOCATION, DEFAULT_GREEDY_FAVOR_EARLY_ALLOCATION); - // List of algorithms - List listAlg = new LinkedList(); - // LowCostAligned planning algorithm ReservationAgent algAligned = new IterativePlanner(new StageExecutionIntervalByDemand(), new StageAllocatorLowCostAligned(smoothnessFactor, allocateLeft), allocateLeft); - listAlg.add(algAligned); - // Greedy planning algorithm ReservationAgent algGreedy = new IterativePlanner(new StageExecutionIntervalUnconstrained(), new StageAllocatorGreedyRLE(allocateLeft), allocateLeft); - listAlg.add(algGreedy); - // Set planner: // 1. Attempt to execute algAligned // 2. If failed, fall back to algGreedy - planner = new TryManyReservationAgents(listAlg); + planner = new TryManyReservationAgents(Arrays.asList(algAligned, algGreedy)); } @Override diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TryManyReservationAgents.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TryManyReservationAgents.java index ab2e1e0..c1872e0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TryManyReservationAgents.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TryManyReservationAgents.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.reservation.planning; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import org.apache.hadoop.conf.Configuration; @@ -39,7 +39,7 @@ // Constructor public TryManyReservationAgents(List algs) { - this.algs = new LinkedList(algs); + this.algs = new ArrayList(algs); } @Override