Author: reschke
Date: Fri Oct 14 13:52:52 2016
New Revision: 1764898

URL: http://svn.apache.org/viewvc?rev=1764898&view=rev
Log:
OAK-4937: JournalGC failing with RDB DocumentStore

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java?rev=1764898&r1=1764897&r2=1764898&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
 Fri Oct 14 13:52:52 2016
@@ -163,6 +163,7 @@ public class JournalGarbageCollector {
 
     private void updateTailTimestamp(long gcOlderThan) {
         UpdateOp op = new UpdateOp(JOURNAL_GC_ID, true);
+        op.set(Document.ID, JOURNAL_GC_ID);
         op.max(TAIL_TIMESTAMP, gcOlderThan);
         ns.getDocumentStore().createOrUpdate(SETTINGS, op);
     }

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java?rev=1764898&r1=1764897&r2=1764898&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCIT.java
 Fri Oct 14 13:52:52 2016
@@ -21,7 +21,6 @@ package org.apache.jackrabbit.oak.plugin
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -32,7 +31,6 @@ public class JournalGCIT  extends Abstra
         super(dsf);
     }
 
-    @Ignore("OAK-4937")
     @Test
     public void journalGCSimpleInvocation() throws Exception{
         DocumentNodeStore ns1 = new DocumentMK.Builder()


Reply via email to