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 ad...@apache.org on 2018/02/05 11:21:37 UTC
svn commit: r1823155 - in /jackrabbit/oak/branches/1.8/oak-segment-tar/src:
main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerTest.java
Author: adulceanu
Date: Mon Feb 5 11:21:36 2018
New Revision: 1823155
URL: http://svn.apache.org/viewvc?rev=1823155&view=rev
Log:
OAK-7162 - Race condition on revisions head between compaction and scheduler could result in skipped commit
Head is not refreshed anymore after a successful commit (code untestable without this change)
Added test case
Added:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerTest.java
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java?rev=1823155&r1=1823154&r2=1823155&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java (original)
+++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java Mon Feb 5 11:21:36 2018
@@ -267,7 +267,6 @@ public class LockBasedScheduler implemen
if (revisions.setHead(before.getRecordId(), after.getRecordId())) {
head.set(after);
contentChanged(after.getChildNode(ROOT), commit.info());
- refreshHead(true);
return head.get().getChildNode(ROOT);
}
Added: jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerTest.java?rev=1823155&view=auto
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerTest.java (added)
+++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerTest.java Mon Feb 5 11:21:36 2018
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.segment.scheduler;
+
+import static com.google.common.collect.Lists.newArrayList;
+import static java.util.concurrent.Executors.newFixedThreadPool;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
+import org.apache.jackrabbit.oak.segment.RecordId;
+import org.apache.jackrabbit.oak.segment.Revisions;
+import org.apache.jackrabbit.oak.segment.SegmentNodeState;
+import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.junit.Test;
+
+public class LockBasedSchedulerTest {
+
+ private NodeState getRoot(Scheduler scheduler) {
+ return scheduler.getHeadNodeState().getChildNode("root");
+ }
+
+ /**
+ * OAK-7162
+ *
+ * This test guards against race conditions which may happen when the head
+ * state in {@link Revisions} is changed from outside the scheduler. If a
+ * race condition happens at that point, data from a single commit will be
+ * lost.
+ */
+ @Test
+ public void testSimulatedRaceOnRevisions() throws Exception {
+ final MemoryStore ms = new MemoryStore();
+ final LockBasedScheduler scheduler = LockBasedScheduler.builder(ms.getRevisions(), ms.getReader()).build();
+
+ final RecordId initialHead = ms.getRevisions().getHead();
+ ExecutorService executorService = newFixedThreadPool(10);
+ final AtomicInteger count = new AtomicInteger();
+ final Random rand = new Random();
+
+ try {
+ Callable<PropertyState> commitTask = new Callable<PropertyState>() {
+ @Override
+ public PropertyState call() throws Exception {
+ String property = "prop" + count.incrementAndGet();
+ Commit commit = createCommit(scheduler, property, "value");
+ SegmentNodeState result = (SegmentNodeState) scheduler.schedule(commit);
+
+ return result.getProperty(property);
+ }
+ };
+
+ Callable<Void> parallelTask = new Callable<Void>() {
+ @Override
+ public Void call() throws Exception {
+ Thread.sleep(rand.nextInt(10));
+ ms.getRevisions().setHead(ms.getRevisions().getHead(), initialHead);
+ return null;
+ }
+ };
+
+ List<Future<?>> results = newArrayList();
+ for (int i = 0; i < 100; i++) {
+ results.add(executorService.submit(commitTask));
+ executorService.submit(parallelTask);
+ }
+
+ for (Future<?> result : results) {
+ assertNotNull(
+ "PropertyState must not be null! The corresponding commit got lost because of a race condition.",
+ result.get());
+ }
+ } finally {
+ new ExecutorCloser(executorService).close();
+ }
+ }
+
+ private Commit createCommit(final Scheduler scheduler, final String property, String value) {
+ NodeBuilder a = getRoot(scheduler).builder();
+ a.setProperty(property, value);
+ Commit commit = new Commit(a, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ return commit;
+ }
+}