svn commit: r1161315 - in /hadoop/common/branches/branch-0.22/hdfs: CHANGES.txt src/test/hdfs/org/apache/hadoop/hdfs/TestLeaseRecovery2.java

[shv]

Author: shv
Date: Wed Aug 24 22:57:32 2011
New Revision: 1161315

URL: http://svn.apache.org/viewvc?rev=1161315&view=rev
Log:
HDFS-2258. Reset lease limits to default values in TestLeaseRecovery2. 
Contributed by Konstantin Shvachko

Modified:
    hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
    
hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestLeaseRecovery2.java

Modified: hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt?rev=1161315&r1=1161314&r2=1161315&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt Wed Aug 24 22:57:32 2011
@@ -664,6 +664,8 @@ Release 0.21.1 - Unreleased
     HDFS-1855. TestDatanodeBlockScanner.testBlockCorruptionRecoveryPolicy()
     part 2 fails in two different ways. (Matt Foley via eli)
 
+    HDFS-2258. Reset lease limits to default values in TestLeaseRecovery2. 
(shv)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestLeaseRecovery2.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestLeaseRecovery2.java?rev=1161315&r1=1161314&r2=1161315&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestLeaseRecovery2.java
 (original)
+++ 
hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestLeaseRecovery2.java
 Wed Aug 24 22:57:32 2011
@@ -32,6 +32,7 @@ import org.apache.hadoop.fs.FSDataOutput
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
@@ -306,6 +307,9 @@ public class TestLeaseRecovery2 {
     u2g_map.put(fakeUsername, new String[] {fakeGroup});
     DFSTestUtil.updateConfWithFakeGroupMapping(conf, u2g_map);
 
+    // Reset default lease periods
+    cluster.setLeasePeriod(FSConstants.LEASE_SOFTLIMIT_PERIOD,
+                           FSConstants.LEASE_HARDLIMIT_PERIOD);
     //create a file
     // create a random file name
     String filestr = "/foo" + AppendTestUtil.nextInt();