diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 6c6dbca6755..e871ef0032c 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -291,6 +291,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 f4e5d2370fa..95acfe342ee 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 class MockLocalizerStatus implements LocalizerStatus { return false; } MockLocalizerStatus other = (MockLocalizerStatus) o; - return getLocalizerId().equals(other) + return getLocalizerId().equals(other.getLocalizerId()) && getResources().containsAll(other.getResources()) && other.getResources().containsAll(getResources()); }