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

YARN-3207. Secondary filter matches entites which do not have the key 

being filtered for. Contributed by Zhijie Shen

(cherry picked from commit 57db50cbe3)
(cherry picked from commit ba18adbb27)
(cherry picked from commit 9fd18e94849600ec66832df5ae424eeb0116330c)
This commit is contained in:
Xuan 2015-02-17 18:17:29 -08:00 committed by Vinod Kumar Vavilapalli
parent 28160a0bd6
commit 95edb6e64f
3 changed files with 7 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

@ -79,6 +79,9 @@ Release 2.6.1 - UNRELEASED
http(s)://proxy addr:port/proxy/<appId> to avoid duplicate sections. (Devaraj
K via zjshen)
YARN-3207. Secondary filter matches entites which do not have the key being
filtered for. (Zhijie Shen via xgong)
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES

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

@ -772,7 +772,7 @@ public class LeveldbTimelineStore extends AbstractService
if (v == null) {
Set<Object> vs = entity.getPrimaryFilters()
.get(filter.getName());
if (vs != null && !vs.contains(filter.getValue())) {
if (vs == null || !vs.contains(filter.getValue())) {
filterPassed = false;
break;
}

3
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

@ -767,6 +767,9 @@ public class TimelineStoreTestUtils {
entities = getEntitiesWithFilters("type_1", userFilter, badTestingFilters);
assertEquals(0, entities.size());
entities = getEntitiesWithFilters("type_5", null, badTestingFilters);
assertEquals(0, entities.size());
}
public void testGetEvents() throws IOException {