Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 95022 invoked from network); 17 Nov 2009 21:00:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Nov 2009 21:00:17 -0000 Received: (qmail 53953 invoked by uid 500); 17 Nov 2009 21:00:17 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 53880 invoked by uid 500); 17 Nov 2009 21:00:16 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 53871 invoked by uid 99); 17 Nov 2009 21:00:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2009 21:00:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 17 Nov 2009 21:00:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ACC4F23889CB; Tue, 17 Nov 2009 20:59:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r881509 - in /hadoop/common/trunk: ./ src/java/ src/java/org/apache/hadoop/conf/ src/java/org/apache/hadoop/fs/ src/java/org/apache/hadoop/security/ src/test/core/org/apache/hadoop/security/ Date: Tue, 17 Nov 2009 20:59:46 -0000 To: common-commits@hadoop.apache.org From: ddas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091117205946.ACC4F23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ddas Date: Tue Nov 17 20:59:46 2009 New Revision: 881509 URL: http://svn.apache.org/viewvc?rev=881509&view=rev Log: HADOOP-6367. Removes Access Token implementation from common. Contributed by Kan Zhang. Removed: hadoop/common/trunk/src/java/org/apache/hadoop/security/AccessKey.java hadoop/common/trunk/src/java/org/apache/hadoop/security/AccessToken.java hadoop/common/trunk/src/java/org/apache/hadoop/security/AccessTokenHandler.java hadoop/common/trunk/src/java/org/apache/hadoop/security/ExportedAccessKeys.java hadoop/common/trunk/src/java/org/apache/hadoop/security/InvalidAccessTokenException.java hadoop/common/trunk/src/test/core/org/apache/hadoop/security/SecurityTestUtil.java hadoop/common/trunk/src/test/core/org/apache/hadoop/security/TestAccessToken.java Modified: hadoop/common/trunk/CHANGES.txt hadoop/common/trunk/src/java/core-default.xml hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java Modified: hadoop/common/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=881509&r1=881508&r2=881509&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Tue Nov 17 20:59:46 2009 @@ -653,6 +653,9 @@ HADOOP-6343. Log unexpected throwable object caught in RPC. (Jitendra Nath Pandey via szetszwo) + HADOOP-6367. Removes Access Token implementation from common. + (Kan Zhang via ddas) + OPTIMIZATIONS HADOOP-5595. NameNode does not need to run a replicator to choose a Modified: hadoop/common/trunk/src/java/core-default.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/core-default.xml?rev=881509&r1=881508&r2=881509&view=diff ============================================================================== --- hadoop/common/trunk/src/java/core-default.xml (original) +++ hadoop/common/trunk/src/java/core-default.xml Tue Nov 17 20:59:46 2009 @@ -270,29 +270,6 @@ - fs.access.token.enable - false - - If "true", access tokens are used as capabilities for accessing datanodes. - If "false", no access tokens are checked on accessing datanodes. - - - - - fs.access.key.update.interval - 600 - - Interval in minutes at which namenode updates its access keys. - - - - - fs.access.token.lifetime - 600 - The lifetime of access tokens in minutes. - - - fs.s3.block.size 67108864 Block size to use when writing files to S3. Modified: hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java?rev=881509&r1=881508&r2=881509&view=diff ============================================================================== --- hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java (original) +++ hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java Tue Nov 17 20:59:46 2009 @@ -1757,12 +1757,6 @@ new String[]{CommonConfigurationKeys.FS_CLIENT_BUFFER_DIR_KEY}); Configuration.addDeprecation("hadoop.native.lib", new String[]{CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY}); - Configuration.addDeprecation("dfs.access.token.enable", - new String[]{CommonConfigurationKeys.FS_ACCESS_TOKEN_ENABLE_KEY}); - Configuration.addDeprecation("dfs.access.key.update.interval", - new String[]{CommonConfigurationKeys.FS_ACCESS_KEY_UPDATE_INTERVAL_KEY}); - Configuration.addDeprecation("dfs.access.token.lifetime", - new String[]{CommonConfigurationKeys.FS_ACCESS_TOKEN_LIFETIME_KEY}); Configuration.addDeprecation("fs.default.name", new String[]{CommonConfigurationKeys.FS_DEFAULT_NAME_KEY}); } Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java?rev=881509&r1=881508&r2=881509&view=diff ============================================================================== --- hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java (original) +++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java Tue Nov 17 20:59:46 2009 @@ -43,15 +43,6 @@ public static final int FS_PERMISSIONS_UMASK_DEFAULT = 0022; public static final String FS_DF_INTERVAL_KEY = "fs.df.interval"; public static final long FS_DF_INTERVAL_DEFAULT = 60000; - public static final String FS_ACCESS_TOKEN_ENABLE_KEY = - "fs.access.token.enable"; - public static final boolean FS_ACCESS_TOKEN_ENABLE_DEFAULT = false; - public static final String FS_ACCESS_KEY_UPDATE_INTERVAL_KEY = - "fs.access.key.update.interval"; - public static final long FS_ACCESS_KEY_UPDATE_INTERVAL_DEFAULT = 600; - public static final String FS_ACCESS_TOKEN_LIFETIME_KEY = - "fs.access.token.lifetime"; - public static final long FS_ACCESS_TOKEN_LIFETIME_DEFAULT = 600; //Defaults are not specified for following keys