Repository: giraph Updated Branches: refs/heads/trunk 1a4756b66 -> 6cb6acb44
[GIRAPH-1020] TaskInfo equality condition bug fix Summary: Currently equality is checked based on the raw host-name of an object with lower-case host-name of another object. This is not the right semantic and can cause subsequent bugs in partition assignment and migration. Test Plan: mvn clean verify Reviewers: maja.kabiljo, sergey.edunov, dionysis.logothetis, avery.ching Reviewed By: dionysis.logothetis Differential Revision: https://reviews.facebook.net/D42273 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/6cb6acb4 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/6cb6acb4 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/6cb6acb4 Branch: refs/heads/trunk Commit: 6cb6acb44a1cff4136125faf763e67525ea696b1 Parents: 1a4756b Author: Hassan Eslami <[email protected]> Authored: Wed Jul 15 12:48:22 2015 -0700 Committer: Avery Ching <[email protected]> Committed: Wed Jul 15 12:50:09 2015 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/6cb6acb4/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 79f95b0..e728810 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Giraph Change Log Release 1.2.0 - unreleased ======= + GIRAPH-1020: TaskInfo equality condition. (heslami via aching) + GIRAPH-1019: Optimizing and debugging vertex mutation. (heslami via aching) GIRAPH-1018: Improving PartitionStore API to better match its expected behaviour http://git-wip-us.apache.org/repos/asf/giraph/blob/6cb6acb4/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java b/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java index d593204..ab3ac64 100644 --- a/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java +++ b/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java @@ -110,7 +110,7 @@ public abstract class TaskInfo implements Writable { public boolean equals(Object other) { if (other instanceof TaskInfo) { TaskInfo taskInfo = (TaskInfo) other; - if (hostname.equals(taskInfo.getHostname()) && + if (getHostname().equals(taskInfo.getHostname()) && (getTaskId() == taskInfo.getTaskId()) && (port == taskInfo.getPort() && (taskId == taskInfo.getTaskId()))) {
