svn commit: r1065967 - in /hadoop/hdfs/branches/branch-0.22: ./ src/java/org/apache/hadoop/hdfs/server/namenode/ src/java/org/apache/hadoop/hdfs/tools/

[shv]

Author: shv
Date: Tue Feb  1 09:58:32 2011
New Revision: 1065967

URL: http://svn.apache.org/viewvc?rev=1065967&view=rev
Log:
HDFS-1591. HDFS part of HADOOP-6642. Merge from trunk to branch 0.22

Modified:
    hadoop/hdfs/branches/branch-0.22/CHANGES.txt
    
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
    
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
    
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/tools/DFSck.java

Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1065967&r1=1065966&r2=1065967&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Tue Feb  1 09:58:32 2011
@@ -435,6 +435,8 @@ Release 0.22.0 - Unreleased
 
     HDFS-1561. BackupNode listens on the default host. (shv)
 
+    HDFS-1591. HDFS part of HADOOP-6642. (Chris Douglas, Po Cheung via shv)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: 
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1065967&r1=1065966&r2=1065967&view=diff
==============================================================================
--- 
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 (original)
+++ 
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 Tue Feb  1 09:58:32 2011
@@ -95,6 +95,7 @@ import java.lang.management.ManagementFa
 import java.net.InetAddress;
 import java.net.URI;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -180,7 +181,8 @@ public class FSNamesystem implements FSC
   private long blockTokenLifetime;
   
   // Scan interval is not configurable.
-  private final long DELEGATION_TOKEN_REMOVER_SCAN_INTERVAL = 3600000; // 1 
hour
+  private static final long DELEGATION_TOKEN_REMOVER_SCAN_INTERVAL =
+    TimeUnit.MILLISECONDS.convert(1, TimeUnit.HOURS);
   private DelegationTokenSecretManager dtSecretManager;
 
   //

Modified: 
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java?rev=1065967&r1=1065966&r2=1065967&view=diff
==============================================================================
--- 
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
 (original)
+++ 
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
 Tue Feb  1 09:58:32 2011
@@ -197,7 +197,7 @@ public class SecondaryNameNode implement
           
           if(UserGroupInformation.isSecurityEnabled()) {
             System.setProperty("https.cipherSuites", 
-                Krb5AndCertsSslSocketConnector.KRB5_CIPHER_SUITES[0]);
+                Krb5AndCertsSslSocketConnector.KRB5_CIPHER_SUITES.get(0));
             InetSocketAddress secInfoSocAddr = 
               NetUtils.createSocketAddr(infoBindAddress + ":"+ conf.get(
                 "dfs.secondary.https.port", infoBindAddress + ":" + 0));

Modified: 
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/tools/DFSck.java
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/tools/DFSck.java?rev=1065967&r1=1065966&r2=1065967&view=diff
==============================================================================
--- 
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/tools/DFSck.java
 (original)
+++ 
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/tools/DFSck.java
 Tue Feb  1 09:58:32 2011
@@ -197,7 +197,7 @@ public class DFSck extends Configured im
     String proto = "http://";;
     if (UserGroupInformation.isSecurityEnabled()) {
       System.setProperty("https.cipherSuites",
-          Krb5AndCertsSslSocketConnector.KRB5_CIPHER_SUITES[0]);
+          Krb5AndCertsSslSocketConnector.KRB5_CIPHER_SUITES.get(0));
       proto = "https://";;
     }
     final StringBuilder url = new StringBuilder(proto);