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

YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie Shen

This commit is contained in:
Xuan 2014-11-05 18:26:07 -08:00
parent d698ed1d6f
commit e26be1d85c
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -845,6 +845,8 @@ Release 2.6.0 - UNRELEASED
FatalEventDispatcher try to transition RM to StandBy at the same time. FatalEventDispatcher try to transition RM to StandBy at the same time.
(Rohith Sharmaks via jianhe) (Rohith Sharmaks via jianhe)
YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. (Zhijie Shen via xgong)
Release 2.5.2 - UNRELEASED Release 2.5.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
View File

@ -241,6 +241,10 @@ public class MemoryTimelineStore
public TimelineDomains getDomains(String owner) public TimelineDomains getDomains(String owner)
throws IOException { throws IOException {
List<TimelineDomain> domains = new ArrayList<TimelineDomain>(); List<TimelineDomain> domains = new ArrayList<TimelineDomain>();
Set<TimelineDomain> domainsOfOneOwner = domainsByOwner.get(owner);
if (domainsOfOneOwner == null) {
return new TimelineDomains();
}
for (TimelineDomain domain : domainsByOwner.get(owner)) { for (TimelineDomain domain : domainsByOwner.get(owner)) {
TimelineDomain domainToReturn = createTimelineDomain( TimelineDomain domainToReturn = createTimelineDomain(
domain.getId(), domain.getId(),

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
View File

@ -946,6 +946,10 @@ public class TimelineStoreTestUtils {
assertEquals(2, actualDomains.getDomains().size()); assertEquals(2, actualDomains.getDomains().size());
verifyDomainInfo(domain3, actualDomains.getDomains().get(0)); verifyDomainInfo(domain3, actualDomains.getDomains().get(0));
verifyDomainInfo(domain1, actualDomains.getDomains().get(1)); verifyDomainInfo(domain1, actualDomains.getDomains().get(1));
// owner without any domain
actualDomains = store.getDomains("owner_4");
assertEquals(0, actualDomains.getDomains().size());
} }
private static void verifyDomainInfo( private static void verifyDomainInfo(