svn commit: r1079207 - in /hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop: mapred/Task.java mapreduce/Job.java

[om...@apache.org]

Author: omalley
Date: Tue Mar  8 05:55:46 2011
New Revision: 1079207

URL: http://svn.apache.org/viewvc?rev=1079207&view=rev
Log:
commit cd5a8847d4349955f9593ca50fa54056d63eac67
Author: Greg Roelofs <ro...@yahoo-inc.com>
Date:   Wed Dec 8 16:51:13 2010 -0800

    Temporary debug printfs while working through uber-failing unit tests.

Modified:
    hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/Task.java
    hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/Job.java

Modified: hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/Task.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/Task.java?rev=1079207&r1=1079206&r2=1079207&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/Task.java (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/Task.java Tue Mar  8 05:55:46 2011
@@ -1014,6 +1014,7 @@ abstract public class Task implements Wr
         try {
           while (!umbilical.canCommit(taskIdForUmbilical)) {
             try {
+System.out.println("GRR DEBUG:  Task commit(): TT canCommit() returned false; sleeping 1 sec");
               // FIXME 1:  shouldn't this count down retries, too, in case JT glitched and no longer knows about us?  (else infinite loop)
               Thread.sleep(1000);  // FIXME 2:  shouldn't hardcoded 1-second sleep instead correspond to heartbeat interval for task?
             } catch(InterruptedException ie) {
@@ -1021,8 +1022,10 @@ abstract public class Task implements Wr
             }
             reporter.setProgressFlag();
           }
+System.out.println("GRR DEBUG:  Task commit(): TT canCommit() returned true");
           break;
         } catch (IOException ie) {
+System.out.println("GRR DEBUG:  Task commit(): TT canCommit() threw exception");
           LOG.warn("Failure asking whether task can commit: " +
               StringUtils.stringifyException(ie));
           if (--retries == 0) {
@@ -1034,6 +1037,7 @@ abstract public class Task implements Wr
       }
     }
 
+System.out.println("GRR DEBUG:  Task commit(): about to call commitTask()");
     // task can Commit now  
     try {
       LOG.info("Task " + taskId + " is allowed to commit now");

Modified: hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/Job.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/Job.java?rev=1079207&r1=1079206&r2=1079207&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/Job.java (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/Job.java Tue Mar  8 05:55:46 2011
@@ -574,7 +574,9 @@ public class Job extends JobContextImpl 
    */
   public Counters getCounters() 
       throws IOException, InterruptedException {
+System.out.println("GRR DEBUG:  Job getCounters(): about to call ensureState()");
     ensureState(JobState.RUNNING);
+System.out.println("GRR DEBUG:  Job getCounters(): back from ensureState(); about to call cluster.getClient().getJobCounters()");
     return cluster.getClient().getJobCounters(getJobID());
   }
 
@@ -1134,9 +1136,11 @@ public class Job extends JobContextImpl 
     }
     LOG.info("Job complete: " + jobId);
     Counters counters = getCounters();
+System.out.println("GRR DEBUG:  Job monitorAndPrintJob(): back from getCounters()");
     if (counters != null) {
       LOG.info(counters.toString());
     }
+System.out.println("GRR DEBUG:  Job monitorAndPrintJob(): returning " + isSuccessful() + " (status.getState() = " + status.getState() + ")");
     return isSuccessful();
   }