Author: mahadev
Date: Thu Aug 11 18:32:25 2011
New Revision: 1156719
URL: http://svn.apache.org/viewvc?rev=1156719&view=rev
Log:
MAPREDUCE-2808. pull MAPREDUCE-2797 into mr279 branch (thomas graves via mahadev)
Modified:
hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java
hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCacheOldApi.java
Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1156719&r1=1156718&r2=1156719&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Thu Aug 11 18:32:25 2011
@@ -4,6 +4,8 @@ Trunk (unreleased changes)
MAPREDUCE-279
+ MAPREDUCE-2808. pull MAPREDUCE-2797 into mr279 branch (thomas graves via mahadev)
+
Fixed CS locality wait factor. (acmurthy)
MAPREDUCE-2781. mr279 RM application finishtime not set
Modified: hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java?rev=1156719&r1=1156718&r2=1156719&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java
(original)
+++ hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java
Thu Aug 11 18:32:25 2011
@@ -32,6 +32,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
@@ -147,7 +148,7 @@ public class TestBinaryTokenFile {
dfsCluster.getFileSystem().getUri().toString(), 1, null, null, null,
jConf);
- dfsCluster.getNamesystem().getDelegationTokenSecretManager().startThreads();
+ NameNodeAdapter.getDtSecretManager(dfsCluster.getNamesystem()).startThreads();
FileSystem fs = dfsCluster.getFileSystem();
p1 = new Path("file1");
Modified: hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java?rev=1156719&r1=1156718&r2=1156719&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
(original)
+++ hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
Thu Aug 11 18:32:25 2011
@@ -45,6 +45,7 @@ import org.apache.hadoop.hdfs.MiniDFSClu
import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenSecretManager;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
@@ -160,7 +161,7 @@ public class TestTokenCache {
createTokenFileJson();
verifySecretKeysInJSONFile();
- dfsCluster.getNamesystem().getDelegationTokenSecretManager().startThreads();
+ NameNodeAdapter.getDtSecretManager(dfsCluster.getNamesystem()).startThreads();
FileSystem fs = dfsCluster.getFileSystem();
p1 = new Path("file1");
@@ -305,8 +306,8 @@ public class TestTokenCache {
public void testGetTokensForHftpFS() throws IOException, URISyntaxException {
HftpFileSystem hfs = mock(HftpFileSystem.class);
- DelegationTokenSecretManager dtSecretManager =
- dfsCluster.getNamesystem().getDelegationTokenSecretManager();
+ DelegationTokenSecretManager dtSecretManager =
+ NameNodeAdapter.getDtSecretManager(dfsCluster.getNamesystem());
String renewer = "renewer/foo@BAR";
jConf.set(MRConfig.MASTER_USER_NAME,renewer);
DelegationTokenIdentifier dtId =
Modified: hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCacheOldApi.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCacheOldApi.java?rev=1156719&r1=1156718&r2=1156719&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCacheOldApi.java
(original)
+++ hadoop/common/branches/MR-279/mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCacheOldApi.java
Thu Aug 11 18:32:25 2011
@@ -39,6 +39,7 @@ import org.apache.hadoop.conf.Configured
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.NullWritable;
@@ -185,8 +186,7 @@ public class TestTokenCacheOldApi {
createTokenFileJson();
verifySecretKeysInJSONFile();
- dfsCluster.getNamesystem()
- .getDelegationTokenSecretManager().startThreads();
+ NameNodeAdapter.getDtSecretManager(dfsCluster.getNamesystem()).startThreads();
FileSystem fs = dfsCluster.getFileSystem();
p1 = new Path("file1");
|