svn commit: r987388 - in /hadoop/hdfs/trunk: CHANGES.txt src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj

[cos]

Author: cos
Date: Fri Aug 20 06:43:27 2010
New Revision: 987388

URL: http://svn.apache.org/viewvc?rev=987388&view=rev
Log:
HDFS-1157. Modifications introduced by HDFS-1150 are breaking aspect's 
bindings. Contributed by Konstantin Boudnik

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    
hadoop/hdfs/trunk/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=987388&r1=987387&r2=987388&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri Aug 20 06:43:27 2010
@@ -213,6 +213,9 @@ Trunk (unreleased changes)
 
     HDFS-1347.  TestDelegationToken uses mortbay.log for logging (boryas)
 
+    HDFS-1157. Modifications introduced by HDFS-1150 are breaking aspect's
+    bindings (cos)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/hdfs/trunk/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj?rev=987388&r1=987387&r2=987388&view=diff
==============================================================================
--- 
hadoop/hdfs/trunk/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj
 (original)
+++ 
hadoop/hdfs/trunk/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj
 Fri Aug 20 06:43:27 2010
@@ -26,6 +26,7 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.hdfs.test.system.DNProtocol;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.test.system.DaemonProtocol;
+import 
org.apache.hadoop.hdfs.server.datanode.SecureDataNodeStarter.SecureResources;
 
 public privileged aspect DataNodeAspect {
   declare parents : DataNode implements DNProtocol;
@@ -34,18 +35,20 @@ public privileged aspect DataNodeAspect 
     return super.getConf();
   }
 
-  pointcut dnConstructorPointcut(Configuration conf, AbstractList<File> dirs) :
-    call(DataNode.new(Configuration, AbstractList<File>))
-    && args(conf, dirs);
-
-  after(Configuration conf, AbstractList<File> dirs) returning (DataNode 
datanode):
-    dnConstructorPointcut(conf, dirs) {
+  pointcut dnConstructorPointcut(Configuration conf, AbstractList<File> dirs,
+      SecureResources resources) :
+    call(DataNode.new(Configuration, AbstractList<File>, SecureResources))
+    && args(conf, dirs, resources);
+
+  after(Configuration conf, AbstractList<File> dirs, SecureResources resources)
+    returning (DataNode datanode):
+    dnConstructorPointcut(conf, dirs, resources) {
     try {
       UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
       datanode.setUser(ugi.getShortUserName());
     } catch (IOException e) {
       datanode.LOG.warn("Unable to get the user information for the " +
-          "Jobtracker");
+          "DataNode");
     }
     datanode.setReady(true);
   }