Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 811AF7879 for ; Thu, 11 Aug 2011 18:32:48 +0000 (UTC) Received: (qmail 78329 invoked by uid 500); 11 Aug 2011 18:32:48 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 78287 invoked by uid 500); 11 Aug 2011 18:32:47 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 78279 invoked by uid 99); 11 Aug 2011 18:32:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2011 18:32:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2011 18:32:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3655A23889C5; Thu, 11 Aug 2011 18:32:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1156719 - in /hadoop/common/branches/MR-279/mapreduce: ./ src/test/mapred/org/apache/hadoop/mapreduce/security/ Date: Thu, 11 Aug 2011 18:32:26 -0000 To: mapreduce-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110811183226.3655A23889C5@eris.apache.org> 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");