svn commit: r1730066 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document: JournalTest.java mongo/JournalIT.java

[st...@apache.org]

Author: stefanegli
Date: Fri Feb 12 16:40:40 2016
New Revision: 1730066

URL: http://svn.apache.org/viewvc?rev=1730066&view=rev
Log:
OAK-3975 : default journalGC batch size used in tests set to 100

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java?rev=1730066&r1=1730065&r2=1730066&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java Fri Feb 12 16:40:40 2016
@@ -186,15 +186,15 @@ public class JournalTest extends Abstrac
         JournalGarbageCollector gc = new JournalGarbageCollector(ns1);
         // first clean up
         Thread.sleep(100); // OAK-2979 : wait 100ms before doing the cleanup
-        gc.gc(1, 150, TimeUnit.MILLISECONDS);
+        gc.gc(1, 100, TimeUnit.MILLISECONDS);
         Thread.sleep(100); // sleep just quickly
-        assertEquals(0, gc.gc(1, 150, TimeUnit.DAYS));
-        assertEquals(0, gc.gc(6, 150, TimeUnit.HOURS));
-        assertEquals(0, gc.gc(1, 150, TimeUnit.HOURS));
-        assertEquals(0, gc.gc(10, 150, TimeUnit.MINUTES));
-        assertEquals(0, gc.gc(1, 150, TimeUnit.MINUTES));
-        assertEquals(0, gc.gc(1, 150, TimeUnit.SECONDS));
-        assertEquals(0, gc.gc(1, 150, TimeUnit.MILLISECONDS));
+        assertEquals(0, gc.gc(1, 100, TimeUnit.DAYS));
+        assertEquals(0, gc.gc(6, 100, TimeUnit.HOURS));
+        assertEquals(0, gc.gc(1, 100, TimeUnit.HOURS));
+        assertEquals(0, gc.gc(10, 100, TimeUnit.MINUTES));
+        assertEquals(0, gc.gc(1, 100, TimeUnit.MINUTES));
+        assertEquals(0, gc.gc(1, 100, TimeUnit.SECONDS));
+        assertEquals(0, gc.gc(1, 100, TimeUnit.MILLISECONDS));
         
         // create some entries that can be deleted thereupon
         mk1.commit("/", "+\"regular1\": {}", null, null);
@@ -202,16 +202,16 @@ public class JournalTest extends Abstrac
         mk1.commit("/", "+\"regular3\": {}", null, null);
         mk1.commit("/regular2", "+\"regular4\": {}", null, null);
         Thread.sleep(100); // sleep 100millis
-        assertEquals(0, gc.gc(5, 150, TimeUnit.SECONDS));
-        assertEquals(0, gc.gc(1, 150, TimeUnit.MILLISECONDS));
+        assertEquals(0, gc.gc(5, 100, TimeUnit.SECONDS));
+        assertEquals(0, gc.gc(1, 100, TimeUnit.MILLISECONDS));
         ns1.runBackgroundOperations();
         mk1.commit("/", "+\"regular5\": {}", null, null);
         ns1.runBackgroundOperations();
         mk1.commit("/", "+\"regular6\": {}", null, null);
         ns1.runBackgroundOperations();
         Thread.sleep(100); // sleep 100millis
-        assertEquals(0, gc.gc(5, 150, TimeUnit.SECONDS));
-        assertEquals(3, gc.gc(1, 150, TimeUnit.MILLISECONDS));
+        assertEquals(0, gc.gc(5, 100, TimeUnit.SECONDS));
+        assertEquals(3, gc.gc(1, 100, TimeUnit.MILLISECONDS));
     }
     
     @Test

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java?rev=1730066&r1=1730065&r2=1730066&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java Fri Feb 12 16:40:40 2016
@@ -200,7 +200,7 @@ public class JournalIT extends AbstractJ
         JournalGarbageCollector gc = new JournalGarbageCollector(ns1);
         clock.getTimeIncreasing();
         clock.getTimeIncreasing();
-        gc.gc(0, 150, TimeUnit.MILLISECONDS); // cleanup everything that might still be there
+        gc.gc(0, 100, TimeUnit.MILLISECONDS); // cleanup everything that might still be there
 
         // create entries as parametrized:
         for(int i=offset; i<size+offset; i++) {
@@ -210,7 +210,7 @@ public class JournalIT extends AbstractJ
             ns1.runBackgroundOperations();
         }
         Thread.sleep(100); // sleep 100millis
-        assertEquals(size, gc.gc(0, 150, TimeUnit.MILLISECONDS)); // should now be able to clean up everything
+        assertEquals(size, gc.gc(0, 100, TimeUnit.MILLISECONDS)); // should now be able to clean up everything
     }
 
     protected DocumentMK createMK(int clusterId, int asyncDelay) {