Author: alexparvulescu Date: Tue Dec 8 08:46:33 2015 New Revision: 1718534
URL: http://svn.apache.org/viewvc?rev=1718534&view=rev Log: OAK-3436 Prevent missing checkpoint due to unstable topology from causing complete reindexing - fix for eager checkpoint cleanup issue Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1718534&r1=1718533&r2=1718534&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java Tue Dec 8 08:46:33 2015 @@ -223,8 +223,8 @@ public class AsyncIndexUpdate implements NodeBuilder builder = root.builder(); NodeBuilder async = builder.child(ASYNC); async.setProperty(leaseName, lease); - updateTempCheckpoints(async, checkpoint, afterCheckpoint); mergeWithConcurrencyCheck(store, builder, checkpoint, beforeLease, name); + updateTempCheckpoints(async, checkpoint, afterCheckpoint); // reset updates counter indexStats.resetUpdates(); Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java?rev=1718534&r1=1718533&r2=1718534&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java Tue Dec 8 08:46:33 2015 @@ -39,7 +39,6 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import com.google.common.collect.ImmutableSet; @@ -80,7 +79,6 @@ public class AsyncIndexUpdateLeaseTest e } @Test - @Ignore("OAK-3436") public void testPrePrepare() throws Exception { // take care of initial reindex before new AsyncIndexUpdate(name, store, provider).run();
