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 ch...@apache.org on 2015/03/04 15:24:02 UTC
svn commit: r1664011 - in /jackrabbit/oak/trunk/oak-lucene: ./
src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: chetanm
Date: Wed Mar 4 14:24:02 2015
New Revision: 1664011
URL: http://svn.apache.org/r1664011
Log:
OAK-2570 - Open indexes in IndexTracker non blocking way
Added:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java (with props)
Modified:
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1664011&r1=1664010&r2=1664011&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Wed Mar 4 14:24:02 2015
@@ -275,5 +275,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
+ <version>1.2.0</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java?rev=1664011&r1=1664010&r2=1664011&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java Wed Mar 4 14:24:02 2015
@@ -39,6 +39,7 @@ import org.apache.felix.scr.annotations.
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
+import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
@@ -95,22 +96,33 @@ public class LuceneIndexProviderService
)
private static final String PROP_LOCAL_INDEX_DIR = "localIndexDir";
+ @Property(
+ boolValue = true,
+ label = "Open index asynchronously",
+ description = "Enable opening of indexes in asynchronous mode"
+ )
+ private static final String PROP_ASYNC_INDEX_OPEN = "enableOpenIndexAsync";
+
private Whiteboard whiteboard;
private WhiteboardExecutor executor;
+ private BackgroundObserver backgroundObserver;
+
@Activate
private void activate(BundleContext bundleContext, Map<String, ?> config)
throws NotCompliantMBeanException {
initializeFactoryClassLoaders(getClass().getClassLoader());
whiteboard = new OsgiWhiteboard(bundleContext);
+ executor = new WhiteboardExecutor();
+ executor.start(whiteboard);
indexProvider = new LuceneIndexProvider(createTracker(bundleContext, config));
initializeLogging(config);
initialize();
regs.add(bundleContext.registerService(QueryIndexProvider.class.getName(), indexProvider, null));
- regs.add(bundleContext.registerService(Observer.class.getName(), indexProvider, null));
+ registerObserver(bundleContext, config);
oakRegs.add(registerMBean(whiteboard,
LuceneIndexMBean.class,
@@ -129,6 +141,10 @@ public class LuceneIndexProviderService
reg.unregister();
}
+ if (backgroundObserver != null){
+ backgroundObserver.close();
+ }
+
if (indexProvider != null) {
indexProvider.close();
indexProvider = null;
@@ -177,8 +193,6 @@ public class LuceneIndexProviderService
"directory path [%s] nor repository home [%s] defined", PROP_LOCAL_INDEX_DIR, REPOSITORY_HOME);
File indexDir = new File(indexDirPath);
- executor = new WhiteboardExecutor();
- executor.start(whiteboard);
IndexCopier copier = new IndexCopier(executor, indexDir);
log.info("Enabling CopyOnRead support. Index files would be copied under {}", indexDir.getAbsolutePath());
@@ -194,6 +208,17 @@ public class LuceneIndexProviderService
return new IndexTracker();
}
+ private void registerObserver(BundleContext bundleContext, Map<String, ?> config) {
+ boolean enableAsyncIndexOpen = PropertiesUtil.toBoolean(config.get(PROP_ASYNC_INDEX_OPEN), true);
+ Observer observer = indexProvider;
+ if (enableAsyncIndexOpen) {
+ backgroundObserver = new BackgroundObserver(indexProvider, executor, 5);
+ observer = backgroundObserver;
+ log.info("Registering the LuceneIndexProvider as a BackgroundObserver");
+ }
+ regs.add(bundleContext.registerService(Observer.class.getName(), observer, null));
+ }
+
private void initializeFactoryClassLoaders(ClassLoader classLoader) {
ClassLoader originalClassLoader = Thread.currentThread()
.getContextClassLoader();
Added: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java?rev=1664011&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java (added)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java Wed Mar 4 14:24:02 2015
@@ -0,0 +1,62 @@
+/*
+ * 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.plugins.index.lucene;
+
+import java.util.HashMap;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
+import org.apache.jackrabbit.oak.spi.commit.Observer;
+import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
+import org.apache.sling.testing.mock.osgi.MockOsgi;
+import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class LuceneIndexProviderServiceTest {
+ @Rule
+ public final OsgiContext context = new OsgiContext();
+
+ private LuceneIndexProviderService service = new LuceneIndexProviderService();
+
+ @Test
+ public void defaultSetup() throws Exception{
+ MockOsgi.activate(service, context.bundleContext(), new HashMap<String, Object>());
+
+ assertNotNull(context.getService(QueryIndexProvider.class));
+ assertNotNull(context.getService(Observer.class));
+
+ assertTrue(context.getService(Observer.class) instanceof BackgroundObserver);
+
+ MockOsgi.deactivate(service);
+ }
+
+ @Test
+ public void disableOpenIndexAsync() throws Exception{
+ MockOsgi.activate(service, context.bundleContext(), ImmutableMap.<String,Object>of("enableOpenIndexAsync", false));
+
+ assertTrue(context.getService(Observer.class) instanceof LuceneIndexProvider);
+
+ MockOsgi.deactivate(service);
+ }
+}
Propchange: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native