From b167fe7605deb29ec533047d79d036eb65328853 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Fri, 8 May 2015 11:14:45 +0900 Subject: [PATCH] YARN-1832. Fix wrong MockLocalizerStatus#equals implementation. Contributed by Hong Zhiguo. --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../containermanager/localizer/MockLocalizerStatus.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index eed28d8b4c..fac3fa57ba 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -336,6 +336,9 @@ Release 2.8.0 - UNRELEASED YARN-2918. RM should not fail on startup if queue's configured labels do not exist in cluster-node-labels. (Wangda Tan via jianhe) + YARN-1832. Fix wrong MockLocalizerStatus#equals implementation. + (Hong Zhiguo via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/MockLocalizerStatus.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/MockLocalizerStatus.java index f4e5d2370f..95acfe342e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/MockLocalizerStatus.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/MockLocalizerStatus.java @@ -67,7 +67,7 @@ public boolean equals(Object o) { return false; } MockLocalizerStatus other = (MockLocalizerStatus) o; - return getLocalizerId().equals(other) + return getLocalizerId().equals(other.getLocalizerId()) && getResources().containsAll(other.getResources()) && other.getResources().containsAll(getResources()); }