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

This commit is contained in:
Karthik Kambatla 2014-09-24 15:23:31 -07:00
parent 9fa5a89be3
commit 39c87344e1
2 changed files with 3 additions and 1 deletions

View File

@ -439,6 +439,8 @@ Release 2.6.0 - UNRELEASED
YARN-2161. Fix build on macosx: YARN parts (Binglin Chang via aw) 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 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -88,7 +88,7 @@ public class SchedulerApplicationAttempt {
protected final Resource currentReservation = Resource.newInstance(0, 0); protected final Resource currentReservation = Resource.newInstance(0, 0);
private Resource resourceLimit = Resource.newInstance(0, 0); private Resource resourceLimit = Resource.newInstance(0, 0);
protected Resource currentConsumption = 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 unmanagedAM = true;
private boolean amRunning = false; private boolean amRunning = false;