hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r881514 - in /hadoop/common/branches/branch-0.21: ./ 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 21:02:57 GMT
Author: ddas
Date: Tue Nov 17 21:02:56 2009
New Revision: 881514

URL: http://svn.apache.org/viewvc?rev=881514&view=rev
Log:
Merge -r 881508:881509 from trunk onto 0.21 branch. Fixes HADOOP-6367.

Removed:
    hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/security/AccessKey.java
    hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/security/AccessToken.java
    hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/security/AccessTokenHandler.java
    hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/security/ExportedAccessKeys.java
    hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/security/InvalidAccessTokenException.java
    hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/security/SecurityTestUtil.java
    hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/security/TestAccessToken.java
Modified:
    hadoop/common/branches/branch-0.21/CHANGES.txt
    hadoop/common/branches/branch-0.21/src/java/core-default.xml
    hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/conf/Configuration.java
    hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java

Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=881514&r1=881513&r2=881514&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Tue Nov 17 21:02:56 2009
@@ -610,6 +610,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/branches/branch-0.21/src/java/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/core-default.xml?rev=881514&r1=881513&r2=881514&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/java/core-default.xml (original)
+++ hadoop/common/branches/branch-0.21/src/java/core-default.xml Tue Nov 17 21:02:56 2009
@@ -257,29 +257,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/branches/branch-0.21/src/java/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/conf/Configuration.java?rev=881514&r1=881513&r2=881514&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/conf/Configuration.java
(original)
+++ hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/conf/Configuration.java
Tue Nov 17 21:02:56 2009
@@ -1765,12 +1765,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/branches/branch-0.21/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java?rev=881514&r1=881513&r2=881514&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
(original)
+++ hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
Tue Nov 17 21:02:56 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



Mime
View raw message