You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by di...@apache.org on 2018/05/26 01:26:53 UTC
git commit: updated refs/heads/trunk to 81d3805
Repository: giraph
Updated Branches:
refs/heads/trunk 243a02487 -> 81d3805ca
GIRAPH-1194
closes #74
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/81d3805c
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/81d3805c
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/81d3805c
Branch: refs/heads/trunk
Commit: 81d3805cae760e12ca120b2725a6c31b83da035f
Parents: 243a024
Author: Dionysios Logothetis <dl...@gmail.com>
Authored: Fri May 25 18:26:33 2018 -0700
Committer: Dionysios Logothetis <di...@fb.com>
Committed: Fri May 25 18:26:33 2018 -0700
----------------------------------------------------------------------
.../org/apache/giraph/master/BspServiceMaster.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/81d3805c/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java b/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
index 31d10df..1f8a77f 100644
--- a/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
+++ b/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
@@ -1299,6 +1299,7 @@ public class BspServiceMaster<I extends WritableComparable,
String workerInfoHealthyPath =
getWorkerInfoHealthyPath(getApplicationAttempt(), getSuperstep());
List<String> finishedHostnameIdList = new ArrayList<>();
+ List<String> tmpFinishedHostnameIdList;
long nextInfoMillis = System.currentTimeMillis();
final int defaultTaskTimeoutMsec = 10 * 60 * 1000; // from TaskTracker
final int waitBetweenLogInfoMsec = 30 * 1000;
@@ -1311,7 +1312,7 @@ public class BspServiceMaster<I extends WritableComparable,
while (true) {
if (! logInfoOnlyRun) {
try {
- finishedHostnameIdList =
+ tmpFinishedHostnameIdList =
getZkExt().getChildrenExt(finishedWorkerPath,
true,
false,
@@ -1326,14 +1327,16 @@ public class BspServiceMaster<I extends WritableComparable,
"children of " + finishedWorkerPath, e);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("barrierOnWorkerList: Got finished worker list = " +
- finishedHostnameIdList + ", size = " +
- finishedHostnameIdList.size() +
- ", worker list = " +
- workerInfoList + ", size = " +
- workerInfoList.size() +
+ // Log the names of the new workers that have finished since last time
+ Set<String> newFinishedHostnames = Sets.difference(
+ Sets.newHashSet(tmpFinishedHostnameIdList),
+ Sets.newHashSet(finishedHostnameIdList));
+ LOG.debug("barrierOnWorkerList: Got new finished worker list = " +
+ newFinishedHostnames + ", size = " +
+ newFinishedHostnames.size() +
" from " + finishedWorkerPath);
}
+ finishedHostnameIdList = tmpFinishedHostnameIdList;
}
if (LOG.isInfoEnabled() &&