svn commit: r1189635 - in /incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp: BSPJobClient.java GroomServer.java JobInProgress.java TaskInProgress.java TaskRunner.java

[ed...@apache.org]

Author: edwardyoon
Date: Thu Oct 27 06:46:46 2011
New Revision: 1189635

URL: http://svn.apache.org/viewvc?rev=1189635&view=rev
Log:
Add info logs

Modified:
    incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java
    incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/GroomServer.java
    incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java
    incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java
    incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskRunner.java

Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java?rev=1189635&r1=1189634&r2=1189635&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java (original)
+++ incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java Thu Oct 27 06:46:46 2011
@@ -300,7 +300,7 @@ public class BSPJobClient extends Config
     int maxTasks = clusterStatus.getMaxTasks();
 
     if (tasks <= 0 || tasks > maxTasks) {
-      LOG.warn("The number of tasks you've entered was invalid. Using default value of "
+      LOG.info("The number of tasks you've entered was invalid. Using default value of "
           + maxTasks + "!");
       job.setNumBspTask(maxTasks);
     }

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=1189635&r1=1189634&r2=1189635&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 Thu Oct 27 06:46:46 2011
@@ -39,7 +39,6 @@ import java.util.concurrent.LinkedBlocki
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.filecache.DistributedCache;
 import org.apache.hadoop.fs.FSError;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -147,6 +146,8 @@ public class GroomServer implements Runn
       }
 
       if (actions != null) {
+        LOG.info("Launch " + actions.length + " tasks.");
+        
         assignedPeerNames = new HashMap<TaskAttemptID, Integer>();
         int i = 0;
 
@@ -312,8 +313,6 @@ public class GroomServer implements Runn
     this.groomServerName = "groomd_" + this.rpcServer.replace(':', '_');
     LOG.info("Starting groom: " + this.rpcServer);
 
-    DistributedCache.purgeCache(this.conf);
-
     // establish the communication link to bsp master
     this.masterClient = (MasterProtocol) RPC.waitForProxy(MasterProtocol.class,
         MasterProtocol.versionID, bspMasterAddr, conf);
@@ -426,6 +425,7 @@ public class GroomServer implements Runn
             if (!tip.runner.isAlive()) {
               if (taskStatus.getRunState() != TaskStatus.State.FAILED) {
                 taskStatus.setRunState(TaskStatus.State.SUCCEEDED);
+                LOG.info("Task '" + taskStatus.getTaskId().toString() + "' has completed.");
               }
               taskStatus.setPhase(TaskStatus.Phase.CLEANUP);
             }
@@ -476,7 +476,7 @@ public class GroomServer implements Runn
     } catch (IOException e1) {
       LOG.error(e1);
     }
-
+    
     TaskInProgress tip = new TaskInProgress(t, jobConf, this.groomServerName);
 
     synchronized (this) {
@@ -786,6 +786,7 @@ public class GroomServer implements Runn
       taskStatus.setRunState(TaskStatus.State.RUNNING);
       this.runner = task.createRunner(GroomServer.this);
       this.runner.start();
+      LOG.info("Task '" + task.getTaskID().toString() + "' has started.");
     }
 
     /**

Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java?rev=1189635&r1=1189634&r2=1189635&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java (original)
+++ incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java Thu Oct 27 06:46:46 2011
@@ -201,7 +201,7 @@ class JobInProgress {
     master.createJobRoot(this.getJobID().toString());
     
     tasksInited = true;
-    LOG.debug("Job is initialized.");
+    LOG.info("Job is initialized.");
   }
 
   public synchronized Task obtainNewTask(GroomServerStatus status,
@@ -231,7 +231,7 @@ class JobInProgress {
   public synchronized void completedTask(TaskInProgress tip, TaskStatus status) {
     TaskAttemptID taskid = status.getTaskId();
     updateTaskStatus(tip, status);
-    LOG.info("Taskid '" + taskid + "' has finished successfully.");
+    LOG.debug("Taskid '" + taskid + "' has finished successfully.");
     tip.completed(taskid);
 
     //
@@ -253,7 +253,7 @@ class JobInProgress {
       this.finishTime = System.currentTimeMillis();
       this.status.setFinishTime(this.finishTime);
 
-      LOG.debug("Job successfully done.");
+      LOG.info("Job successfully done.");
       
       // delete job root
       master.deleteJobRoot(this.getJobID().toString());
@@ -287,7 +287,7 @@ class JobInProgress {
       this.finishTime = System.currentTimeMillis();
       this.status.setFinishTime(this.finishTime);
 
-      LOG.debug("Job failed.");
+      LOG.info("Job failed.");
 
       garbageCollect();
     }

Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java?rev=1189635&r1=1189634&r2=1189635&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java (original)
+++ incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java Thu Oct 27 06:46:46 2011
@@ -212,7 +212,7 @@ class TaskInProgress {
   }
 
   public void completed(TaskAttemptID taskid) {
-    LOG.info("Task '" + taskid.getTaskID().toString() + "' has completed.");
+    LOG.debug("Task '" + taskid.getTaskID().toString() + "' has completed.");
 
     TaskStatus status = (TaskStatus) taskStatuses.get(taskid);
     status.setRunState(TaskStatus.State.SUCCEEDED);

Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskRunner.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskRunner.java?rev=1189635&r1=1189634&r2=1189635&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskRunner.java (original)
+++ incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskRunner.java Thu Oct 27 06:46:46 2011
@@ -78,7 +78,7 @@ public class TaskRunner extends Thread {
 
     void start() {
       this.future.set(this.sched.schedule(this, 0, SECONDS));
-      LOG.info("Start building BSPPeer process.");
+      LOG.debug("Start building BSPPeer process.");
     }
 
     void stop() {
@@ -246,7 +246,7 @@ public class TaskRunner extends Thread {
     } catch (ExecutionException ee) {
       LOG.error("Failure occurs when retrieving tasks result.", ee);
     }
-    LOG.info("Finishes executing BSPPeer child process.");
+    LOG.debug("Finishes executing BSPPeer child process.");
   }
 
   /**