Skip to content

Commit 359728c

Browse files
committed
YARN-1184. ClassCastException during preemption enforcement.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1523865 13f79535-47bb-0310-9956-ffa450edef68
1 parent 3e06fca commit 359728c

File tree

2 files changed

+7
-2
lines changed
  • hadoop-yarn-project
    • hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity

2 files changed

+7
-2
lines changed

hadoop-yarn-project/CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ Release 2.1.1-beta - UNRELEASED
174174
YARN-540. Race condition causing RM to potentially relaunch already
175175
unregistered AMs on RM restart (Jian He via bikas)
176176

177+
YARN-1184. ClassCastException during preemption enforcement. (cdouglas)
178+
177179
Release 2.1.0-beta - 2013-08-22
178180

179181
INCOMPATIBLE CHANGES

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,9 +1609,12 @@ public void recoverContainer(Resource clusterResource,
16091609

16101610
}
16111611

1612-
// need to access the list of apps from the preemption monitor
1612+
/**
1613+
* Obtain (read-only) collection of active applications.
1614+
*/
16131615
public Set<FiCaSchedulerApp> getApplications() {
1614-
return Collections.unmodifiableSet(activeApplications);
1616+
// need to access the list of apps from the preemption monitor
1617+
return activeApplications;
16151618
}
16161619

16171620
// return a single Resource capturing the overal amount of pending resources

0 commit comments

Comments
 (0)