Browse Source

HDFS-2258. Reset lease limits to default values in TestLeaseRecovery2. Contributed by Konstantin Shvachko

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1161315 13f79535-47bb-0310-9956-ffa450edef68
Konstantin Shvachko 14 years ago
parent
commit
eee03e52a4

+ 2 - 0
hdfs/CHANGES.txt

@@ -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

+ 4 - 0
hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestLeaseRecovery2.java

@@ -32,6 +32,7 @@ import org.apache.hadoop.fs.FSDataOutputStream;
 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();