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/10/21 07:49:20 UTC
svn commit: r1187186 - in /incubator/hama/trunk: CHANGES.txt
core/src/main/java/org/apache/hama/bsp/GroomServer.java
core/src/main/java/org/apache/hama/bsp/GroomServerStatus.java
Author: edwardyoon
Date: Fri Oct 21 05:49:19 2011
New Revision: 1187186
URL: http://svn.apache.org/viewvc?rev=1187186&view=rev
Log:
GroomServerStatus.countTask() always returns 1
Modified:
incubator/hama/trunk/CHANGES.txt
incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java
incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServerStatus.java
Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1187186&r1=1187185&r2=1187186&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Fri Oct 21 05:49:19 2011
@@ -12,6 +12,7 @@ Release 0.4 - Unreleased
BUG FIXES
+ HAMA-459: GroomServerStatus.countTask() always returns 1 (edwardyoon)
HAMA-432: Add statusUpdate() method to BSPPeerProtocol (edwardyoon)
HAMA-437: PiEstimator is not working in Local Mode (Thomas Jungblut)
HAMA-387: Fixed barrier synchronization problem (ChiaHung Lin via edwardyoon)
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=1187186&r1=1187185&r2=1187186&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 Oct 21 05:49:19 2011
@@ -359,7 +359,7 @@ public class GroomServer implements Runn
throws DiskErrorException {
boolean writable = false;
- LOG.info(localDirs);
+ LOG.debug(localDirs);
if (localDirs != null) {
for (int i = 0; i < localDirs.length; i++) {
@@ -412,6 +412,7 @@ public class GroomServer implements Runn
while (running && !shuttingDown) {
try {
+ List<TaskStatus> taskStatuses = new ArrayList<TaskStatus>();
// Reports to a BSPMaster
for (Map.Entry<TaskAttemptID, TaskInProgress> e : runningTasks
.entrySet()) {
@@ -430,9 +431,10 @@ public class GroomServer implements Runn
}
}
- doReport(taskStatus);
+ taskStatuses.add(taskStatus);
}
-
+
+ doReport(taskStatuses);
Thread.sleep(REPORT_INTERVAL);
} catch (InterruptedException ie) {
}
@@ -494,9 +496,9 @@ public class GroomServer implements Runn
/**
* Update and report refresh status back to BSPMaster.
*/
- public void doReport(TaskStatus taskStatus) {
+ public void doReport(List<TaskStatus> taskStatuses) {
GroomServerStatus groomStatus = new GroomServerStatus(groomServerName,
- updateTaskStatus(taskStatus), failures, maxCurrentTasks, rpcServer,
+ updateTaskStatuses(taskStatuses), failures, maxCurrentTasks, rpcServer,
groomHostName);
try {
boolean ret = masterClient.report(new ReportGroomStatusDirective(
@@ -511,20 +513,21 @@ public class GroomServer implements Runn
}
}
- public List<TaskStatus> updateTaskStatus(TaskStatus taskStatus) {
+ public List<TaskStatus> updateTaskStatuses(List<TaskStatus> taskStatuses) {
List<TaskStatus> tlist = new ArrayList<TaskStatus>();
- if (taskStatus.getRunState() == TaskStatus.State.SUCCEEDED
- || taskStatus.getRunState() == TaskStatus.State.FAILED) {
- synchronized (finishedTasks) {
- TaskInProgress tip = runningTasks.remove(taskStatus.getTaskId());
+ for(TaskStatus taskStatus : taskStatuses) {
+ if (taskStatus.getRunState() == TaskStatus.State.SUCCEEDED
+ || taskStatus.getRunState() == TaskStatus.State.FAILED) {
+ synchronized (finishedTasks) {
+ TaskInProgress tip = runningTasks.remove(taskStatus.getTaskId());
+ tlist.add((TaskStatus) taskStatus.clone());
+ finishedTasks.put(taskStatus.getTaskId(), tip);
+ }
+ } else if (taskStatus.getRunState() == TaskStatus.State.RUNNING) {
tlist.add((TaskStatus) taskStatus.clone());
- finishedTasks.put(taskStatus.getTaskId(), tip);
}
- } else if (taskStatus.getRunState() == TaskStatus.State.RUNNING) {
- tlist.add((TaskStatus) taskStatus.clone());
}
-
return tlist;
}
@@ -639,6 +642,7 @@ public class GroomServer implements Runn
TaskStatus status = tip.getStatus();
result.add((TaskStatus) status.clone());
}
+
return result;
}
Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServerStatus.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServerStatus.java?rev=1187186&r1=1187185&r2=1187186&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServerStatus.java (original)
+++ incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServerStatus.java Fri Oct 21 05:49:19 2011
@@ -118,7 +118,7 @@ public class GroomServerStatus implement
}
/**
- * Return the current MapTask count
+ * Return the current BSP Task count
*/
public int countTasks() {
int taskCount = 0;