Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-4729. SchedulerApplicationAttempt#getTotalRequiredResources can throw an NPE. (kasha) 

(cherry picked from commit c684f2b007)
This commit is contained in:
Karthik Kambatla 2016-02-24 18:33:57 -08:00
parent 4892f6a0eb
commit 6a75c5af09
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -166,6 +166,9 @@ Release 2.9.0 - UNRELEASED
YARN-4651. Document movetoqueue option in 'YARN Commands' YARN-4651. Document movetoqueue option in 'YARN Commands'
(Takashi Ohnishi via rohithsharmaks) (Takashi Ohnishi via rohithsharmaks)
YARN-4729. SchedulerApplicationAttempt#getTotalRequiredResources can throw
an NPE. (kasha)
Release 2.8.0 - UNRELEASED Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
View File

@ -244,7 +244,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
} }
public synchronized int getTotalRequiredResources(Priority priority) { public synchronized int getTotalRequiredResources(Priority priority) {
return getResourceRequest(priority, ResourceRequest.ANY).getNumContainers(); ResourceRequest request = getResourceRequest(priority, ResourceRequest.ANY);
return request == null ? 0 : request.getNumContainers();
} }
public synchronized Resource getResource(Priority priority) { public synchronized Resource getResource(Priority priority) {