svn commit: r1188412 - /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java

[ns...@apache.org]

Author: nspiegelberg
Date: Mon Oct 24 22:10:40 2011
New Revision: 1188412

URL: http://svn.apache.org/viewvc?rev=1188412&view=rev
Log:
Fix unit test for OldLogsCleaner that broke due to HBASE-4591

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java?rev=1188412&r1=1188411&r2=1188412&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java Mon Oct 24 22:10:40 2011
@@ -74,6 +74,9 @@ public class TestOldLogsCleaner {
   @Test
   public void testLogCleaning() throws Exception{
     Configuration c = TEST_UTIL.getConfiguration();
+    // set TTL
+    long ttl = 2000;
+    c.setLong("hbase.master.logcleaner.ttl", ttl);
     Path oldLogDir = new Path(TEST_UTIL.getTestDir(),
         HConstants.HREGION_OLDLOGDIR_NAME);
     String fakeMachineName = URLEncoder.encode("regionserver:60020", "UTF8");
@@ -88,17 +91,19 @@ public class TestOldLogsCleaner {
     fs.mkdirs(oldLogDir);
     fs.createNewFile(new Path(oldLogDir, "a"));
     fs.createNewFile(new Path(oldLogDir, fakeMachineName + "." + "a"));
-    fs.createNewFile(new Path(oldLogDir, fakeMachineName + "." + now));
     System.out.println("Now is: " + now);
-    for (int i = 0; i < 30; i++) {
-      fs.createNewFile(new Path(oldLogDir, fakeMachineName + "." + (now - 6000000 - i) ));
-    }
-    for (FileStatus stat : fs.listStatus(oldLogDir)) {
-      System.out.println(stat.getPath().toString());
+    for (int i = 1; i < 31; i++) {
+      fs.createNewFile(new Path(oldLogDir, fakeMachineName + "." + (now - i) ));
     }
-
+    // sleep for sometime to get newer modifcation time
+    Thread.sleep(ttl);
+    fs.createNewFile(new Path(oldLogDir, fakeMachineName + "." + now));
     fs.createNewFile(new Path(oldLogDir, fakeMachineName + "." + (now + 10000) ));
 
+    for (FileStatus stat : fs.listStatus(oldLogDir)) {
+        System.out.println(stat.getPath().toString());
+      }
+
     assertEquals(34, fs.listStatus(oldLogDir).length);
 
     // This will take care of 20 old log files (default max we can delete)