MAPREDUCE-2443. Fix TaskAspect for TaskUmbilicalProtocol.ping(..). Contributed by Siddharth Seth

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1094845 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -48,6 +48,10 @@ Release 0.20.204.0 - unreleased
 
     MAPREDUCE-2420. JobTracker should be able to renew delegation token 
     over HTTP (boryas)
+
+    MAPREDUCE-2443. Fix TaskAspect for TaskUmbilicalProtocol.ping(..).
+    (Siddharth Seth via szetszwo)
+
   IMPROVEMENTS
 
     HDFS-1541. Not marking datanodes dead when namenode in safemode.

src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java

@@ -59,6 +59,7 @@ public interface TaskUmbilicalProtocol extends VersionedProtocol {
    * Version 16 Added numRequiredSlots to TaskStatus for MAPREDUCE-516
    * Version 17 Change in signature of getTask() for HADOOP-5488
    * Version 18 Added fatalError for child to communicate fatal errors to TT
+   * Version 19 Added jvmContext to most method signatures for MAPREDUCE-2429
    * */
 
   public static final long versionID = 19L;

src/test/system/aop/org/apache/hadoop/mapred/TaskAspect.aj

@@ -65,12 +65,12 @@ public privileged aspect TaskAspect {
     return;
   }
   
-  pointcut taskStatusUpdate(TaskReporter reporter, TaskAttemptID id) : 
-    call(public boolean TaskUmbilicalProtocol.ping(TaskAttemptID))
-          && this(reporter) && args(id);
+  pointcut taskStatusUpdate(TaskReporter reporter, TaskAttemptID id, JvmContext context) : 
+    call(public boolean TaskUmbilicalProtocol.ping(TaskAttemptID, JvmContext))
+          && this(reporter) && args(id, context);
   
-  after(TaskReporter reporter, TaskAttemptID id) throws IOException : 
-    taskStatusUpdate(reporter, id)  {
+  after(TaskReporter reporter, TaskAttemptID id, JvmContext context) throws IOException : 
+    taskStatusUpdate(reporter, id, context)  {
     synchronized (waitObject) {
       if(isWaitingForSignal.get()) {
         ControlAction[] actions = daemonProxy.getActions(