Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OAK-2407: Auto-refresh sessions on revision gc
Register GCMonitor to detect compaction and auto-refresh git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1662323 13f79535-47bb-0310-9956-ffa450edef68
- Loading branch information
Showing
5 changed files
with
208 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
oak-core/src/main/java/org/apache/jackrabbit/oak/spi/gc/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| @Version("1.0") | ||
| @Export(optional = "provide:=true") | ||
| package org.apache.jackrabbit.oak.spi.gc; | ||
|
|
||
| import aQute.bnd.annotation.Export; | ||
| import aQute.bnd.annotation.Version; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| * 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.jcr; | ||
|
|
||
| import static java.io.File.createTempFile; | ||
| import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_NONE; | ||
| import static org.apache.jackrabbit.oak.plugins.segment.file.FileStore.newFileStore; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.concurrent.Callable; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.concurrent.FutureTask; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
| import javax.jcr.Node; | ||
| import javax.jcr.Repository; | ||
| import javax.jcr.RepositoryException; | ||
| import javax.jcr.Session; | ||
| import javax.jcr.SimpleCredentials; | ||
|
|
||
| import org.apache.jackrabbit.api.JackrabbitRepository; | ||
| import org.apache.jackrabbit.oak.Oak; | ||
| import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; | ||
| import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy; | ||
| import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; | ||
| import org.apache.jackrabbit.oak.spi.state.NodeStore; | ||
| import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard; | ||
| import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| public class RefreshOnGCTest { | ||
| private FileStore fileStore; | ||
| private Repository repository; | ||
|
|
||
| @Before | ||
| public void setup() throws IOException { | ||
| File directory = createTempFile(getClass().getSimpleName(), "test", new File("target")); | ||
| directory.delete(); | ||
| directory.mkdir(); | ||
|
|
||
| Whiteboard whiteboard = new DefaultWhiteboard(); | ||
| fileStore = newFileStore(directory) | ||
| .withWhiteBoard(whiteboard) | ||
| .create() | ||
| .setCompactionStrategy(new CompactionStrategy( | ||
| false, false, CLEAN_NONE, 0, CompactionStrategy.MEMORY_THRESHOLD_DEFAULT) { | ||
| @Override | ||
| public boolean compacted(@Nonnull Callable<Boolean> setHead) throws Exception { | ||
| setHead.call(); | ||
| return true; | ||
| } | ||
| }); | ||
|
|
||
| NodeStore nodeStore = new SegmentNodeStore(fileStore); | ||
| Oak oak = new Oak(nodeStore); | ||
| oak.with(whiteboard); | ||
| repository = new Jcr(oak).createRepository(); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| if (repository instanceof JackrabbitRepository) { | ||
| ((JackrabbitRepository) repository).shutdown(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void compactionCausesRefresh() throws RepositoryException, InterruptedException, ExecutionException { | ||
| Session session = repository.login(new SimpleCredentials("admin", "admin".toCharArray())); | ||
| try { | ||
| Node root = session.getRootNode(); | ||
| root.addNode("one"); | ||
| session.save(); | ||
|
|
||
| addNode(repository, "two"); | ||
|
|
||
| fileStore.compact(); | ||
| assertTrue(root.hasNode("one")); | ||
| assertTrue("Node two must be visible as compaction should cause the session to refresh", | ||
| root.hasNode("two")); | ||
| } finally { | ||
| session.logout(); | ||
| } | ||
| } | ||
|
|
||
| private static void addNode(final Repository repository, final String name) | ||
| throws ExecutionException, InterruptedException { | ||
| // Execute on different threads to ensure same thread session | ||
| // refreshing doesn't come into our way | ||
| run(new Callable<Void>() { | ||
| @Override | ||
| public Void call() throws Exception { | ||
| Session session = repository.login(new SimpleCredentials("admin", "admin".toCharArray())); | ||
| try { | ||
| Node root = session.getRootNode(); | ||
| root.addNode(name); | ||
| session.save(); | ||
| } finally { | ||
| session.logout(); | ||
| } | ||
| return null; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private static void run(Callable<Void> callable) throws InterruptedException, ExecutionException { | ||
| FutureTask<Void> task = new FutureTask<Void>(callable); | ||
| new Thread(task).start(); | ||
| task.get(); | ||
| } | ||
|
|
||
|
|
||
| } |