Author: szetszwo
Date: Tue Apr 19 03:08:41 2011
New Revision: 1094845
URL: http://svn.apache.org/viewvc?rev=1094845&view=rev
Log:
MAPREDUCE-2443. Fix TaskAspect for TaskUmbilicalProtocol.ping(..). Contributed
by Siddharth Seth
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java
hadoop/common/branches/branch-0.20-security/src/test/system/aop/org/apache/hadoop/mapred/TaskAspect.aj
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1094845&r1=1094844&r2=1094845&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Tue Apr 19 03:08:41
2011
@@ -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.
Modified:
hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java?rev=1094845&r1=1094844&r2=1094845&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java
(original)
+++
hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java
Tue Apr 19 03:08:41 2011
@@ -59,6 +59,7 @@ public interface TaskUmbilicalProtocol e
* 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;
Modified:
hadoop/common/branches/branch-0.20-security/src/test/system/aop/org/apache/hadoop/mapred/TaskAspect.aj
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/system/aop/org/apache/hadoop/mapred/TaskAspect.aj?rev=1094845&r1=1094844&r2=1094845&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security/src/test/system/aop/org/apache/hadoop/mapred/TaskAspect.aj
(original)
+++
hadoop/common/branches/branch-0.20-security/src/test/system/aop/org/apache/hadoop/mapred/TaskAspect.aj
Tue Apr 19 03:08:41 2011
@@ -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(
