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 2013/11/26 02:14:21 UTC
svn commit: r1545490 - in /hama/trunk: CHANGES.txt
core/src/main/java/org/apache/hama/bsp/GroomServer.java
core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
Author: edwardyoon
Date: Tue Nov 26 01:14:21 2013
New Revision: 1545490
URL: http://svn.apache.org/r1545490
Log:
HAMA-818: Remove useless comments in GroomServer
Modified:
hama/trunk/CHANGES.txt
hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
Modified: hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hama/trunk/CHANGES.txt?rev=1545490&r1=1545489&r2=1545490&view=diff
==============================================================================
--- hama/trunk/CHANGES.txt (original)
+++ hama/trunk/CHANGES.txt Tue Nov 26 01:14:21 2013
@@ -6,9 +6,13 @@ Release 0.7.0 (unreleased changes)
HAMA-815: Hama Pipes uses C++ templates (Martin Illecker)
+ BUG FIXES
+
+
IMPROVEMENTS
HAMA-699: Add commons module (Martin Illecker)
+ HAMA-818: Remove useless comments in GroomServer (edwardyoon)
Release 0.6.3 - October 11, 2013
Modified: hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java?rev=1545490&r1=1545489&r2=1545490&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java (original)
+++ hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java Tue Nov 26 01:14:21 2013
@@ -115,7 +115,6 @@ public class GroomServer implements Runn
private Instructor instructor;
// Filesystem
- // private LocalDirAllocator localDirAllocator;
Path systemDirectory = null;
FileSystem systemFS = null;
@@ -140,9 +139,6 @@ public class GroomServer implements Runn
InetSocketAddress taskReportAddress;
Server taskReportServer = null;
- // private BlockingQueue<GroomServerAction> tasksToCleanup = new
- // LinkedBlockingQueue<GroomServerAction>();
-
// Schedule Heartbeats to GroomServer
private ScheduledExecutorService taskMonitorService;
@@ -167,10 +163,6 @@ public class GroomServer implements Runn
LOG.info("Launch " + actions.length + " tasks.");
startNewTask((LaunchTaskAction) action);
} else if (action instanceof KillTaskAction) {
-
- // TODO Use the cleanup thread
- // tasksToCleanup.put(action);
-
LOG.info("Kill " + actions.length + " tasks.");
KillTaskAction killAction = (KillTaskAction) action;
if (tasks.containsKey(killAction.getTaskID())) {
@@ -289,9 +281,6 @@ public class GroomServer implements Runn
System.exit(0);
}
- // FileSystem local = FileSystem.getLocal(conf);
- // this.localDirAllocator = new LocalDirAllocator("bsp.local.dir");
-
try {
zk = new ZooKeeper(QuorumPeer.getZKQuorumServersString(conf),
conf.getInt(Constants.ZOOKEEPER_SESSION_TIMEOUT, 1200000), this);
@@ -363,7 +352,7 @@ public class GroomServer implements Runn
int tmpPort = socAddr.getPort();
// RPC initialization
- // TODO numHandlers should be a ..
+ // TODO Make number of RPC Server threads configurable
this.taskReportServer = RPC.getServer(this, bindAddress, tmpPort, 10,
false, this.conf);
@@ -424,8 +413,6 @@ public class GroomServer implements Runn
this.running = true;
this.initialized = true;
-
- // FIXME
}
/** Return the port at which the tasktracker bound to */
@@ -791,19 +778,14 @@ public class GroomServer implements Runn
// monitorPeriod. A task is given a leeway of 10 times monitorPeriod
// to get started.
- // TODO Please refactor this conditions
- // NOTE: (currentTime - tip.lastPingedTimestamp) > 6 * monitorPeriod
-
+ // TODO The task timeout check interval should be configurable
if (tip.taskStatus.getRunState().equals(TaskStatus.State.RUNNING)
&& (((tip.lastPingedTimestamp == 0 && ((currentTime - tip.startTime) > 10 * monitorPeriod)) || ((tip.lastPingedTimestamp > 0) && (currentTime - tip.lastPingedTimestamp) > 6 * monitorPeriod)))) {
LOG.info("adding purge task: " + tip.getTask().getTaskID());
-
outOfContactTasks.add(tip);
}
-
}
-
}
/**
@@ -1353,6 +1335,7 @@ public class GroomServer implements Runn
@Override
public void process(WatchedEvent event) {
+ // do nothing
}
}
Modified: hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java?rev=1545490&r1=1545489&r2=1545490&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java (original)
+++ hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java Tue Nov 26 01:14:21 2013
@@ -79,6 +79,7 @@ public final class HadoopMessageManagerI
Constants.DEFAULT_PEER_HOST);
InetSocketAddress selfAddress = new InetSocketAddress(bindAddress, 0);
+ // TODO Make number of RPC Server threads configurable
this.server = RPC.getServer(this, selfAddress.getHostName(),
selfAddress.getPort(), conf);
server.start();