Repository: hadoop Updated Branches: refs/heads/branch-2.6.1 28160a0bd -> 95edb6e64
YARN-3207. Secondary filter matches entites which do not have the key being filtered for. Contributed by Zhijie Shen (cherry picked from commit 57db50cbe3ce42618ad6d6869ae337d15b261f4e) (cherry picked from commit ba18adbb27c37a8fa92223a412ce65eaa462d18b) (cherry picked from commit 9fd18e94849600ec66832df5ae424eeb0116330c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/95edb6e6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/95edb6e6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/95edb6e6 Branch: refs/heads/branch-2.6.1 Commit: 95edb6e64fd68e01122058e3d7a8ba6fbcfef733 Parents: 28160a0 Author: Xuan <[email protected]> Authored: Tue Feb 17 18:17:29 2015 -0800 Committer: Vinod Kumar Vavilapalli <[email protected]> Committed: Mon Aug 31 17:44:42 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java | 2 +- .../hadoop/yarn/server/timeline/TimelineStoreTestUtils.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/95edb6e6/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3f96213..5dc5b54 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/95edb6e6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java index b87c821..04a6db2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java @@ -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; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/95edb6e6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java index 6f15b92..c99786d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java @@ -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 {
