svn commit: r1033352 - in /incubator/hama/trunk: CHANGES.txt conf/hama-default.xml src/java/org/apache/hama/bsp/BSPJobClient.java src/java/org/apache/hama/bsp/LocalJobRunner.java

[ed...@apache.org]

Author: edwardyoon
Date: Wed Nov 10 05:05:53 2010
New Revision: 1033352

URL: http://svn.apache.org/viewvc?rev=1033352&view=rev
Log:
Remove LocalJobRunner

Removed:
    incubator/hama/trunk/src/java/org/apache/hama/bsp/LocalJobRunner.java
Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/conf/hama-default.xml
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1033352&r1=1033351&r2=1033352&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Wed Nov 10 05:05:53 2010
@@ -50,6 +50,7 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
     
+    HAMA-313: Remove LocalJobRunner (edwardyoon)
     HAMA-321: Allows user to set the number of tasks (edwardyoon) 
     HAMA-282: Add superstep counter (Filipe Manana via edwardyoon)
     HAMA-327: Add overview for javadoc (edwardyoon)

Modified: incubator/hama/trunk/conf/hama-default.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/conf/hama-default.xml?rev=1033352&r1=1033351&r2=1033352&view=diff
==============================================================================
--- incubator/hama/trunk/conf/hama-default.xml (original)
+++ incubator/hama/trunk/conf/hama-default.xml Wed Nov 10 05:05:53 2010
@@ -24,7 +24,7 @@
 <configuration>
   <property>
     <name>bsp.master.address</name>
-    <value>local</value>
+    <value>localhost</value>
     <description>The address of the bsp master server. Either the
     literal string "local" or a host[:port] (where host is a name or
     IP address) for distributed mode.

Modified: incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java?rev=1033352&r1=1033351&r2=1033352&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java Wed Nov 10 05:05:53 2010
@@ -190,16 +190,10 @@ public class BSPJobClient extends Config
   }
 
   public void init(Configuration conf) throws IOException {
-    // it will be used to determine if the bspmaster is running on local or not.
-    String master = conf.get("bsp.master.address", "local");
-    if ("local".equals(master)) {
-      this.jobSubmitClient = new LocalJobRunner(conf);
-    } else {
-      this.jobSubmitClient = (JobSubmissionProtocol) RPC.getProxy(
-          JobSubmissionProtocol.class, JobSubmissionProtocol.versionID,
-          BSPMaster.getAddress(conf), conf, NetUtils.getSocketFactory(conf,
-              JobSubmissionProtocol.class));
-    }
+    this.jobSubmitClient = (JobSubmissionProtocol) RPC.getProxy(
+        JobSubmissionProtocol.class, JobSubmissionProtocol.versionID, BSPMaster
+            .getAddress(conf), conf, NetUtils.getSocketFactory(conf,
+            JobSubmissionProtocol.class));
   }
 
   /**
@@ -390,7 +384,7 @@ public class BSPJobClient extends Config
       IOException {
     BSPJobClient jc = new BSPJobClient(job.getConf());
 
-    // TODO this code must be removed 
+    // TODO this code must be removed
     // when GroomServer supports the multiple tasks.
     if (job.getNumBspTask() > jc.getClusterStatus(false).getGroomServers()) {
       // If the number of tasks is greater than the number of GroomServer,