big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
being filtered for. Contributed by Zhijie Shen
This commit is contained in:
Xuan 2015-02-17 18:17:29 -08:00
parent 685af8a3d0
commit 57db50cbe3
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

@ -608,6 +608,9 @@ Release 2.7.0 - UNRELEASED
YARN-2749. Fix some testcases from TestLogAggregationService fails in trunk. YARN-2749. Fix some testcases from TestLogAggregationService fails in trunk.
(Xuan Gong via junping_du) (Xuan Gong via junping_du)
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 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES 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

@ -672,7 +672,7 @@ private TimelineEntities getEntityByTime(byte[] base,
if (v == null) { if (v == null) {
Set<Object> vs = entity.getPrimaryFilters() Set<Object> vs = entity.getPrimaryFilters()
.get(filter.getName()); .get(filter.getName());
if (vs != null && !vs.contains(filter.getValue())) { if (vs == null || !vs.contains(filter.getValue())) {
filterPassed = false; filterPassed = false;
break; 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 void testGetEntitiesWithSecondaryFilters() throws IOException {
entities = getEntitiesWithFilters("type_1", userFilter, badTestingFilters); entities = getEntitiesWithFilters("type_1", userFilter, badTestingFilters);
assertEquals(0, entities.size()); assertEquals(0, entities.size());
entities = getEntitiesWithFilters("type_5", null, badTestingFilters);
assertEquals(0, entities.size());
} }
public void testGetEvents() throws IOException { public void testGetEvents() throws IOException {