giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject git commit: updated refs/heads/trunk to 823ff1f
Date Fri, 12 Apr 2013 02:37:27 GMT
Updated Branches:
  refs/heads/trunk 39f359136 -> 823ff1f8c


GIRAPH-614: SplitMasterWorker=false is broken (majakabiljo)


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/823ff1f8
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/823ff1f8
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/823ff1f8

Branch: refs/heads/trunk
Commit: 823ff1f8cb318f942700f6e495560c2a304def94
Parents: 39f3591
Author: Maja Kabiljo <majakabiljo@maja-mbp.thefacebook.com>
Authored: Thu Apr 11 19:36:45 2013 -0700
Committer: Maja Kabiljo <majakabiljo@maja-mbp.thefacebook.com>
Committed: Thu Apr 11 19:36:45 2013 -0700

----------------------------------------------------------------------
 CHANGELOG                                          |    2 +
 .../java/org/apache/giraph/master/MasterInfo.java  |   20 ++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/823ff1f8/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 2cb8eb3..0012fa7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+  GIRAPH-614: SplitMasterWorker=false is broken (majakabiljo)
+
   GIRAPH-616: Decouple vertices and edges in DiskBackedPartitionStore and avoid writing 
   back edges when the algorithm does not change topology. (claudio)
 

http://git-wip-us.apache.org/repos/asf/giraph/blob/823ff1f8/giraph-core/src/main/java/org/apache/giraph/master/MasterInfo.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/master/MasterInfo.java b/giraph-core/src/main/java/org/apache/giraph/master/MasterInfo.java
index 96e988c..90b49c3 100644
--- a/giraph-core/src/main/java/org/apache/giraph/master/MasterInfo.java
+++ b/giraph-core/src/main/java/org/apache/giraph/master/MasterInfo.java
@@ -30,8 +30,26 @@ public class MasterInfo extends TaskInfo {
   public MasterInfo() {
   }
 
+  /**
+   * This taskId is used internally as a unique identification of the
+   * nettyServer which runs on this task. Master is always returning -1
+   * because we need to make sure that the case when option
+   * {@link org.apache.giraph.conf.GiraphConstants#SPLIT_MASTER_WORKER} is
+   * false works correctly (master needs to have different id than the worker
+   * which runs in the same mapper)
+   *
+   * @return -1
+   */
+  @Override
+  public int getTaskId() {
+    return -1;
+  }
+
   @Override
   public String toString() {
-    return "Master(" + super.toString() + ")";
+    return "Master(hostname=" + getHostname() +
+        ", MRtaskID=" + super.getTaskId() +
+        ", port=" + getPort() +
+        ")";
   }
 }


Mime
View raw message