hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject git commit: YARN-2596. TestWorkPreservingRMRestart fails with FairScheduler. (kasha)
Date Wed, 24 Sep 2014 22:23:47 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 9fa5a89be -> 39c87344e


YARN-2596. TestWorkPreservingRMRestart fails with FairScheduler. (kasha)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/39c87344
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/39c87344
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/39c87344

Branch: refs/heads/trunk
Commit: 39c87344e16a08ab69e25345b3bce92aec92db47
Parents: 9fa5a89
Author: Karthik Kambatla <kasha@apache.org>
Authored: Wed Sep 24 15:23:31 2014 -0700
Committer: Karthik Kambatla <kasha@apache.org>
Committed: Wed Sep 24 15:23:31 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/39c87344/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 016ac15..c33bf45 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -439,6 +439,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/39c87344/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;
 


Mime
View raw message