You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ma...@apache.org on 2017/09/15 18:11:11 UTC
[5/5] git commit: updated refs/heads/trunk to 5ccd00f
JIRA-1158
closes #47
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/5ccd00f0
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/5ccd00f0
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/5ccd00f0
Branch: refs/heads/trunk
Commit: 5ccd00f0bebe382507c995944fc5a8cfadd1bc95
Parents: dbf5237
Author: Yuksel Akinci <yu...@fb.com>
Authored: Fri Sep 15 11:03:52 2017 -0700
Committer: Maja Kabiljo <ma...@fb.com>
Committed: Fri Sep 15 11:10:20 2017 -0700
----------------------------------------------------------------------
.../apache/giraph/job/DefaultJobProgressTrackerService.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/5ccd00f0/giraph-core/src/main/java/org/apache/giraph/job/DefaultJobProgressTrackerService.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/job/DefaultJobProgressTrackerService.java b/giraph-core/src/main/java/org/apache/giraph/job/DefaultJobProgressTrackerService.java
index 5845783..61228ce 100644
--- a/giraph-core/src/main/java/org/apache/giraph/job/DefaultJobProgressTrackerService.java
+++ b/giraph-core/src/main/java/org/apache/giraph/job/DefaultJobProgressTrackerService.java
@@ -107,8 +107,7 @@ public class DefaultJobProgressTrackerService
break;
}
- if (!canFinishInTime(conf, job, mappersStarted - 1,
- combinedWorkerProgress)) {
+ if (!canFinishInTime(conf, job, combinedWorkerProgress)) {
killJobWithMessage("Killing the job because it won't " +
"complete in max allotted time: " +
GiraphConstants.MAX_ALLOWED_JOB_TIME_MS.get(conf) / 1000 +
@@ -140,12 +139,11 @@ public class DefaultJobProgressTrackerService
* Determine if the job will finish in allotted time
* @param conf Giraph configuration
* @param job Job
- * @param workerCount Worker count
* @param progress Combined worker progress
* @return true it the job can finish in allotted time, false otherwise
*/
protected boolean canFinishInTime(GiraphConfiguration conf, Job job,
- int workerCount, CombinedWorkerProgress progress) {
+ CombinedWorkerProgress progress) {
// No defaut implementation.
return true;
}