Repository: hadoop Updated Branches: refs/heads/branch-2 3cf28210e -> 30165d4cd
YARN-2596. TestWorkPreservingRMRestart fails with FairScheduler. (kasha) (cherry picked from commit 39c87344e16a08ab69e25345b3bce92aec92db47) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/30165d4c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/30165d4c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/30165d4c Branch: refs/heads/branch-2 Commit: 30165d4cdd88f191a98f8bb0594669585d75ae81 Parents: 3cf2821 Author: Karthik Kambatla <ka...@apache.org> Authored: Wed Sep 24 15:23:31 2014 -0700 Committer: Karthik Kambatla <ka...@apache.org> Committed: Wed Sep 24 15:24:17 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../resourcemanager/scheduler/SchedulerApplicationAttempt.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/30165d4c/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b094f3b..ef70865 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -409,6 +409,8 @@ Release 2.6.0 - UNRELEASED YARN-2161. Fix build on macosx: YARN parts (Binglin Chang via aw) + YARN-2596. TestWorkPreservingRMRestart fails with FairScheduler. (kasha) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/30165d4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.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/scheduler/SchedulerApplicationAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java index 5240789..c9b0303 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java @@ -88,7 +88,7 @@ public class SchedulerApplicationAttempt { protected final Resource currentReservation = Resource.newInstance(0, 0); private Resource resourceLimit = Resource.newInstance(0, 0); protected Resource currentConsumption = Resource.newInstance(0, 0); - private Resource amResource; + private Resource amResource = Resources.none(); private boolean unmanagedAM = true; private boolean amRunning = false;
