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 om...@apache.org on 2011/03/04 04:47:15 UTC
svn commit: r1077159 -
/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Author: omalley
Date: Fri Mar 4 03:47:15 2011
New Revision: 1077159
URL: http://svn.apache.org/viewvc?rev=1077159&view=rev
Log:
commit 1dcd7022752aab71db528edba3538a52bd0ef8ce
Author: Devaraj Das <dd...@yahoo-inc.com>
Date: Tue Feb 9 20:51:39 2010 -0800
HADOOP:4359 from https://issues.apache.org/jira/secure/attachment/12435352/4359.patch
+++ b/YAHOO-CHANGES.txt
+ HADOOP-4359. Fixes a bug in the earlier backport. (ddas)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1077159&r1=1077158&r2=1077159&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Mar 4 03:47:15 2011
@@ -336,6 +336,10 @@ public class FSNamesystem implements FSC
pendingReplications = new PendingReplicationBlocks(
conf.getInt("dfs.replication.pending.timeout.sec",
-1) * 1000L);
+ if (isAccessTokenEnabled) {
+ accessTokenHandler = new AccessTokenHandler(true,
+ accessKeyUpdateInterval, accessTokenLifetime);
+ }
this.hbthread = new Daemon(new HeartbeatMonitor());
this.lmthread = new Daemon(leaseManager.new Monitor());
this.replthread = new Daemon(new ReplicationMonitor());
@@ -345,10 +349,6 @@ public class FSNamesystem implements FSC
this.hostsReader = new HostsFileReader(conf.get("dfs.hosts",""),
conf.get("dfs.hosts.exclude",""));
- if (isAccessTokenEnabled) {
- accessTokenHandler = new AccessTokenHandler(true,
- accessKeyUpdateInterval, accessTokenLifetime);
- }
this.dnthread = new Daemon(new DecommissionManager(this).new Monitor(
conf.getInt("dfs.namenode.decommission.interval", 30),
conf.getInt("dfs.namenode.decommission.nodes.per.interval", 5)));