You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hama.apache.org by ed...@apache.org on 2011/11/04 12:28:39 UTC
svn commit: r1197514 - in
/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp:
BSPMaster.java GroomServer.java
Author: edwardyoon
Date: Fri Nov 4 11:28:39 2011
New Revision: 1197514
URL: http://svn.apache.org/viewvc?rev=1197514&view=rev
Log:
Web Interface does not update Superstep Count
Modified:
incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPMaster.java
incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java
Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPMaster.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPMaster.java?rev=1197514&r1=1197513&r2=1197514&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPMaster.java (original)
+++ incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPMaster.java Fri Nov 4 11:28:39 2011
@@ -158,7 +158,9 @@ public class BSPMaster implements JobSub
if (ts.getRunState() == TaskStatus.State.SUCCEEDED) {
jip.completedTask(tip, ts);
} else if (ts.getRunState() == TaskStatus.State.RUNNING) {
- // do nothing
+ // TODO add progress counter
+ jip.getStatus().setprogress(ts.getSuperstepCount());
+ jip.getStatus().setSuperstepCount(ts.getSuperstepCount());
} else if (ts.getRunState() == TaskStatus.State.FAILED) {
jip.status.setRunState(JobStatus.FAILED);
jip.failedTask(tip, ts);
@@ -173,6 +175,7 @@ public class BSPMaster implements JobSub
}
} else if (jip.getStatus().getRunState() == JobStatus.RUNNING) {
jip.getStatus().setprogress(ts.getSuperstepCount());
+ jip.getStatus().setSuperstepCount(ts.getSuperstepCount());
} else if (jip.getStatus().getRunState() == JobStatus.KILLED) {
GroomProtocol worker = findGroomServer(tmpStatus);
Directive d1 = new DispatchTasksDirective(
Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java?rev=1197514&r1=1197513&r2=1197514&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java (original)
+++ incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java Fri Nov 4 11:28:39 2011
@@ -400,12 +400,10 @@ public class GroomServer implements Runn
// Reports to a BSPMaster
for (Map.Entry<TaskAttemptID, TaskInProgress> e : runningTasks
.entrySet()) {
- Thread.sleep(REPORT_INTERVAL);
TaskInProgress tip = e.getValue();
TaskStatus taskStatus = tip.getStatus();
if (taskStatus.getRunState() == TaskStatus.State.RUNNING) {
- taskStatus.setProgress(taskStatus.getSuperstepCount());
if (!tip.runner.isAlive()) {
if (taskStatus.getRunState() != TaskStatus.State.FAILED) {