You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2015/06/25 10:35:16 UTC
svn commit: r1687441 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java
Author: davide
Date: Thu Jun 25 08:35:16 2015
New Revision: 1687441
URL: http://svn.apache.org/r1687441
Log:
OAK-2961 - Async index fails with OakState0001: Unresolved conflicts in /:async
- un-ignored the test
- applied Alex's patch
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.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=1687441&r1=1687440&r2=1687441&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 Thu Jun 25 08:35:16 2015
@@ -464,7 +464,16 @@ public class AsyncIndexUpdate implements
new ConflictHook(new AnnotatingConflictHandler()),
new EditorHook(new ConflictValidatorProvider()),
concurrentUpdateCheck);
- store.merge(builder, hooks, CommitInfo.EMPTY);
+ try {
+ store.merge(builder, hooks, CommitInfo.EMPTY);
+ } catch (CommitFailedException ex) {
+ // OAK-2961
+ if (ex.isOfType(CommitFailedException.STATE) && ex.getCode() == 1) {
+ throw CONCURRENT_UPDATE;
+ } else {
+ throw ex;
+ }
+ }
}
private static void preAsyncRunStatsStats(AsyncIndexStats stats) {
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java?rev=1687441&r1=1687440&r2=1687441&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java Thu Jun 25 08:35:16 2015
@@ -70,7 +70,7 @@ public class AsyncConflictsIT extends Do
assumeTrue(OakMongoNSRepositoryStub.isMongoDBAvailable());
}
- @Test @Ignore("OAK-2961")
+ @Test
public void updates() throws Exception {
final Map<String, Exception> exceptions = Collections.synchronizedMap(new HashMap<String, Exception>());
final Random generator = new Random(3);