Repository: hadoop Updated Branches: refs/heads/branch-2.9 14ddac317 -> d9d8fa1d3
YARN-7947. Capacity Scheduler intra-queue preemption can NPE for non-schedulable apps. Contributed by Eric Payne. (cherry picked from commit bdd2a184d78379d99c802a43ebec7d2cef0bbaf7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d9d8fa1d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d9d8fa1d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d9d8fa1d Branch: refs/heads/branch-2.9 Commit: d9d8fa1d3aa65946f7fd0502ff8757a032d91fd3 Parents: 14ddac3 Author: Sunil G <[email protected]> Authored: Wed Feb 21 14:35:57 2018 +0530 Committer: Sunil G <[email protected]> Committed: Wed Feb 21 15:32:54 2018 +0530 ---------------------------------------------------------------------- .../monitor/capacity/FifoIntraQueuePreemptionPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d9d8fa1d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java index 3332f2a..1776bd4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java @@ -412,7 +412,7 @@ public class FifoIntraQueuePreemptionPlugin TempUserPerPartition tmpUser = new TempUserPerPartition( tq.leafQueue.getUser(userName), tq.queueName, Resources.clone(userResourceUsage.getUsed(partition)), - Resources.clone(userSpecificAmUsed), + Resources.clone(amUsed), Resources.clone(userResourceUsage.getReserved(partition)), Resources.none()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
