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 dd...@apache.org on 2009/11/17 21:59:46 UTC
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/
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 @@
</property>
<property>
- <name>fs.access.token.enable</name>
- <value>false</value>
- <description>
- If "true", access tokens are used as capabilities for accessing datanodes.
- If "false", no access tokens are checked on accessing datanodes.
- </description>
-</property>
-
-<property>
- <name>fs.access.key.update.interval</name>
- <value>600</value>
- <description>
- Interval in minutes at which namenode updates its access keys.
- </description>
-</property>
-
-<property>
- <name>fs.access.token.lifetime</name>
- <value>600</value>
- <description>The lifetime of access tokens in minutes.</description>
-</property>
-
-<property>
<name>fs.s3.block.size</name>
<value>67108864</value>
<description>Block size to use when writing files to S3.</description>
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