diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceRetentionSet.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceRetentionSet.java index 447a792..8d28c56 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceRetentionSet.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceRetentionSet.java @@ -89,8 +89,5 @@ public int compare(LocalizedResource r1, LocalizedResource r2) { } return ret > 0 ? 1 : -1; } - public boolean equals(Object other) { - return this == other; - } } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationAttemptFinishEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationAttemptFinishEvent.java index 3f6a620..d51404e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationAttemptFinishEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationAttemptFinishEvent.java @@ -40,6 +40,27 @@ public int hashCode() { return appAttemptId.getApplicationId().hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + WritingApplicationAttemptFinishEvent that + = (WritingApplicationAttemptFinishEvent) o; + if (appAttemptId != null && appAttemptId.getApplicationId() != null + && that.appAttemptId != null + ? !appAttemptId.getApplicationId().equals(that.appAttemptId.getApplicationId()) + : that.appAttemptId.getApplicationId() != null) { + return false; + } + + return true; + } + public ApplicationAttemptId getApplicationAttemptId() { return appAttemptId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationAttemptStartEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationAttemptStartEvent.java index 7e092d3..7afe251 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationAttemptStartEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationAttemptStartEvent.java @@ -39,6 +39,27 @@ public int hashCode() { return appAttemptId.getApplicationId().hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + WritingApplicationAttemptStartEvent that + = (WritingApplicationAttemptStartEvent) o; + if (appAttemptId != null && appAttemptId.getApplicationId() != null + && that.appAttemptId != null + ? !appAttemptId.getApplicationId().equals(that.appAttemptId.getApplicationId()) + : that.appAttemptId.getApplicationId() != null) { + return false; + } + + return true; + } + public ApplicationAttemptId getApplicationAttemptId() { return appAttemptId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationFinishEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationFinishEvent.java index 7a20214..814874e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationFinishEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationFinishEvent.java @@ -39,6 +39,23 @@ public int hashCode() { return appId.hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + WritingApplicationFinishEvent that = (WritingApplicationFinishEvent) o; + if (appId != null ? !appId.equals(that.appId) : that.appId != null) { + return false; + } + + return true; + } + public ApplicationId getApplicationId() { return appId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationStartEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationStartEvent.java index 1b5dc78..f45874c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationStartEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingApplicationStartEvent.java @@ -39,6 +39,23 @@ public int hashCode() { return appId.hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + WritingApplicationStartEvent that = (WritingApplicationStartEvent) o; + if (appId != null ? !appId.equals(that.appId) : that.appId != null) { + return false; + } + + return true; + } + public ApplicationId getApplicationId() { return appId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingContainerFinishEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingContainerFinishEvent.java index 6b27166..4ab709f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingContainerFinishEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingContainerFinishEvent.java @@ -38,6 +38,29 @@ public int hashCode() { return containerId.getApplicationAttemptId().getApplicationId().hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + WritingContainerFinishEvent that = (WritingContainerFinishEvent) o; + if (containerId != null && containerId.getApplicationAttemptId() != null + && containerId.getApplicationAttemptId().getApplicationId() != null + && that.containerId != null + && that.containerId.getApplicationAttemptId() != null + ? !containerId.getApplicationAttemptId().getApplicationId().equals( + that.containerId.getApplicationAttemptId().getApplicationId()) + : that.containerId.getApplicationAttemptId().getApplicationId() != null) { + return false; + } + + return true; + } + public ContainerId getContainerId() { return containerId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingContainerStartEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingContainerStartEvent.java index f6df669..53a8d77 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingContainerStartEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/WritingContainerStartEvent.java @@ -38,6 +38,29 @@ public int hashCode() { return containerId.getApplicationAttemptId().getApplicationId().hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + WritingContainerStartEvent that = (WritingContainerStartEvent) o; + if (containerId != null && containerId.getApplicationAttemptId() != null + && containerId.getApplicationAttemptId().getApplicationId() != null + && that.containerId != null + && that.containerId.getApplicationAttemptId() != null + ? !containerId.getApplicationAttemptId().getApplicationId().equals( + that.containerId.getApplicationAttemptId().getApplicationId()) + : that.containerId.getApplicationAttemptId().getApplicationId() != null) { + return false; + } + + return true; + } + public ContainerId getContainerId() { return containerId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/AppAttemptFinishedEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/AppAttemptFinishedEvent.java index 71d9363..4899e25 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/AppAttemptFinishedEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/AppAttemptFinishedEvent.java @@ -55,6 +55,26 @@ public int hashCode() { return appAttemptId.getApplicationId().hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + AppAttemptFinishedEvent that = (AppAttemptFinishedEvent) o; + if (appAttemptId != null && appAttemptId.getApplicationId() != null + && that.appAttemptId != null + ? !appAttemptId.getApplicationId().equals(that.appAttemptId.getApplicationId()) + : that.appAttemptId.getApplicationId() != null) { + return false; + } + + return true; + } + public ApplicationAttemptId getApplicationAttemptId() { return appAttemptId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/AppAttemptRegisteredEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/AppAttemptRegisteredEvent.java index 1d0f16d..d4cfb5c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/AppAttemptRegisteredEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/AppAttemptRegisteredEvent.java @@ -54,6 +54,26 @@ public int hashCode() { return appAttemptId.getApplicationId().hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + AppAttemptRegisteredEvent that = (AppAttemptRegisteredEvent) o; + if (appAttemptId != null && appAttemptId.getApplicationId() != null + && that.appAttemptId != null + ? !appAttemptId.getApplicationId().equals(that.appAttemptId.getApplicationId()) + : that.appAttemptId.getApplicationId() != null) { + return false; + } + + return true; + } + public ApplicationAttemptId getApplicationAttemptId() { return appAttemptId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ApplicationCreatedEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ApplicationCreatedEvent.java index 2373b3b..444502a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ApplicationCreatedEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ApplicationCreatedEvent.java @@ -51,6 +51,23 @@ public int hashCode() { return appId.hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + ApplicationCreatedEvent that = (ApplicationCreatedEvent) o; + if (appId != null ? !appId.equals(that.appId) : that.appId != null) { + return false; + } + + return true; + } + public ApplicationId getApplicationId() { return appId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ApplicationFinishedEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ApplicationFinishedEvent.java index 8d75f92..6cf89f1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ApplicationFinishedEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ApplicationFinishedEvent.java @@ -56,6 +56,23 @@ public int hashCode() { return appId.hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + ApplicationFinishedEvent that = (ApplicationFinishedEvent) o; + if (appId != null ? !appId.equals(that.appId) : that.appId != null) { + return false; + } + + return true; + } + public ApplicationId getApplicationId() { return appId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ContainerCreatedEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ContainerCreatedEvent.java index eeda181..8802516 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ContainerCreatedEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ContainerCreatedEvent.java @@ -48,6 +48,29 @@ public int hashCode() { return containerId.getApplicationAttemptId().getApplicationId().hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + ContainerCreatedEvent that = (ContainerCreatedEvent) o; + if (containerId != null && containerId.getApplicationAttemptId() != null + && containerId.getApplicationAttemptId().getApplicationId() != null + && that.containerId != null + && that.containerId.getApplicationAttemptId() != null + ? !containerId.getApplicationAttemptId().getApplicationId().equals( + that.containerId.getApplicationAttemptId().getApplicationId()) + : that.containerId.getApplicationAttemptId().getApplicationId() != null) { + return false; + } + + return true; + } + public ContainerId getContainerId() { return containerId; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ContainerFinishedEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ContainerFinishedEvent.java index aafd760..31d8550 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ContainerFinishedEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/ContainerFinishedEvent.java @@ -46,6 +46,30 @@ public int hashCode() { return containerId.getApplicationAttemptId().getApplicationId().hashCode(); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + ContainerFinishedEvent that = (ContainerFinishedEvent) o; + if (containerId != null && containerId.getApplicationAttemptId() != null + && containerId.getApplicationAttemptId().getApplicationId() != null + && that.containerId != null + && that.containerId.getApplicationAttemptId() != null + && that.containerId.getApplicationAttemptId().getApplicationId() != null + ? !containerId.getApplicationAttemptId().getApplicationId().equals( + that.containerId.getApplicationAttemptId().getApplicationId()) + : that.containerId.getApplicationAttemptId().getApplicationId() != null) { + return false; + } + + return true; + } + public ContainerId getContainerId() { return containerId; }