YARN-8830. SLS tool fix node addition. Contributed by Bibin A Chundatt.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b4a38e7b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b4a38e7b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b4a38e7b Branch: refs/heads/HDFS-12943 Commit: b4a38e7b3e530756fb79d23dd4e218beeb5e3190 Parents: b60ca37 Author: bibinchundatt <[email protected]> Authored: Mon Oct 15 16:10:25 2018 +0530 Committer: bibinchundatt <[email protected]> Committed: Mon Oct 15 16:10:25 2018 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/sls/SLSRunner.java | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4a38e7b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java index 1e83e40..1fadd42 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java @@ -45,6 +45,8 @@ import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.GnuParser; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; +import org.apache.commons.collections.SetUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -1029,5 +1031,32 @@ public class SLSRunner extends Configured implements Tool { public void setLabels(Set<NodeLabel> labels) { this.labels = labels; } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof NodeDetails)) { + return false; + } + + NodeDetails that = (NodeDetails) o; + + return StringUtils.equals(hostname, that.hostname) && ( + nodeResource == null ? + that.nodeResource == null : + nodeResource.equals(that.nodeResource)) && SetUtils + .isEqualSet(labels, that.labels); + } + + @Override + public int hashCode() { + int result = hostname == null ? 0 : hostname.hashCode(); + result = + 31 * result + (nodeResource == null ? 0 : nodeResource.hashCode()); + result = 31 * result + (labels == null ? 0 : labels.hashCode()); + return result; + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
