You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:18:07 UTC
svn commit: r1077468 -
/hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj
Author: omalley
Date: Fri Mar 4 04:18:07 2011
New Revision: 1077468
URL: http://svn.apache.org/viewvc?rev=1077468&view=rev
Log:
commit 7a2264c68e31bd32443d9ed791cd9a1d16d00305
Author: Konstantin Boudnik <co...@yahoo-inc.com>
Date: Mon May 17 11:16:52 2010 -0700
HDFS:1157 from https://issues.apache.org/jira/secure/attachment/12444716/hdfs-1157.patch
+++ b/YAHOO-CHANGES.txt
+ HDFS-1157. Modifications introduced by HDFS-1150 are breaking aspect's
+ bindings (cos)
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj?rev=1077468&r1=1077467&r2=1077468&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj Fri Mar 4 04:18:07 2011
@@ -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);
}