tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeag...@apache.org
Subject tez git commit: TEZ-2282. Delimit reused yarn container logs (stderr, stdout, syslog) with task attempt start/stop events (Mit Desai via jeagles)
Date Mon, 11 May 2015 19:29:39 GMT
Repository: tez
Updated Branches:
  refs/heads/master d99f2b262 -> 9d582b444


TEZ-2282. Delimit reused yarn container logs (stderr, stdout, syslog) with task attempt start/stop
events (Mit Desai via jeagles)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/9d582b44
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/9d582b44
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/9d582b44

Branch: refs/heads/master
Commit: 9d582b444b7ba7f862802dbb547b059349e25fcf
Parents: d99f2b2
Author: Jonathan Eagles <jeagles@yahoo-inc.com>
Authored: Mon May 11 14:23:14 2015 -0500
Committer: Jonathan Eagles <jeagles@yahoo-inc.com>
Committed: Mon May 11 14:23:14 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 .../src/main/java/org/apache/tez/dag/app/DAGAppMaster.java   | 8 ++++++++
 .../apache/tez/runtime/LogicalIOProcessorRuntimeTask.java    | 5 +++++
 .../src/main/java/org/apache/tez/runtime/task/TezChild.java  | 7 +++++++
 4 files changed, 21 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/9d582b44/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9632e71..16e8ecd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -191,6 +191,7 @@ Release 0.6.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2282. Delimit reused yarn container logs (stderr, stdout, syslog) with task attempt
start/stop events
   TEZ-1529. ATS and TezClient integration in secure kerberos enabled cluster.
   TEZ-2396. pig-tez-tfile-parser pom is hard coded to depend on 0.6.0-SNAPSHOT version.
   TEZ-2237. Valid events should be sent out when an Output is not started.

http://git-wip-us.apache.org/repos/asf/tez/blob/9d582b44/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
index 3e3d6f0..195bc6c 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
@@ -30,8 +30,10 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.security.PrivilegedExceptionAction;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -628,6 +630,9 @@ public class DAGAppMaster extends AbstractService {
     case DAG_FINISHED:
       DAGAppMasterEventDAGFinished finishEvt =
           (DAGAppMasterEventDAGFinished) event;
+      String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Calendar.getInstance().getTime());
+      System.err.println(timeStamp + " Completed Dag: " + finishEvt.getDAGId().toString());
+      System.out.println(timeStamp + " Completed Dag: " + finishEvt.getDAGId().toString());
       if (!isSession) {
         LOG.info("Not a session, AM will unregister as DAG has completed");
         this.taskSchedulerEventHandler.setShouldUnregisterFlag();
@@ -2132,6 +2137,9 @@ public class DAGAppMaster extends AbstractService {
     }
 
     LOG.info("Running DAG: " + dagPlan.getName());
+    String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Calendar.getInstance().getTime());
+    System.err.println(timeStamp + " Running Dag: "+ newDAG.getID());
+    System.out.println(timeStamp + " Running Dag: "+ newDAG.getID());
     // Job name is the same as the app name until we support multiple dags
     // for an app later
     DAGSubmittedEvent submittedEvent = new DAGSubmittedEvent(newDAG.getID(),

http://git-wip-us.apache.org/repos/asf/tez/blob/9d582b44/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
index 1cfe538..e419a8d 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
@@ -21,7 +21,9 @@ package org.apache.tez.runtime;
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -373,6 +375,9 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
         }
         eventRouterThread = null;
       }
+      String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Calendar.getInstance().getTime());
+      System.err.println(timeStamp + " Completed running task attempt: " + taskSpec.getTaskAttemptID().toString());
+      System.out.println(timeStamp + " Completed running task attempt: " + taskSpec.getTaskAttemptID().toString());
     }
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/9d582b44/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java
index bfec349..36297a9 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java
@@ -24,6 +24,8 @@ import java.net.URI;
 import java.net.URL;
 import java.nio.ByteBuffer;
 import java.security.PrivilegedExceptionAction;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -226,6 +228,11 @@ public class TezChild {
       } else {
         String loggerAddend = containerTask.getTaskSpec().getTaskAttemptID().toString();
         taskCount++;
+        String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Calendar.getInstance().getTime());
+        System.err.println(timeStamp + " Starting to run new task attempt: " +
+            containerTask.getTaskSpec().getTaskAttemptID().toString());
+        System.out.println(timeStamp + " Starting to run new task attempt: " +
+            containerTask.getTaskSpec().getTaskAttemptID().toString());
         TezUtilsInternal.updateLoggers(loggerAddend);
         FileSystem.clearStatistics();
 


Mime
View raw message