Author: chetanm
Date: Wed Jul 20 07:05:11 2016
New Revision: 1753460
URL: http://svn.apache.org/viewvc?rev=1753460&view=rev
Log:
OAK-4563 - Specify thread pool name which should be used by Async Indexing task
Merging 1753444
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 20 07:05:11 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738775,1738795,1738833,1738950,1738957,1738963,1739894,1740116,1740625-1740626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1745368,1746086,1746117,1746342,1746345,1746696,1746981,1747341-1747342,1747492,1747512,1748505,1748553,1748722,1748870,1749275,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750076-1750077,1750287,1750457,1750465,1750495,1750626,1750809,1751410,1751478,1751755,1751871,1752273-1752274,1752438,1752447,1752508,1752616,1752659,1752672,1753262
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738775,1738795,1738833,1738950,1738957,1738963,1739894,1740116,1740625-1740626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1745368,1746086,1746117,1746342,1746345,1746696,1746981,1747341-1747342,1747492,1747512,1748505,1748553,1748722,1748870,1749275,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750076-1750077,1750287,1750457,1750465,1750495,1750626,1750809,1751410,1751478,1751755,1751871,1752273-1752274,1752438,1752447,1752508,1752616,1752659,1752672,1753262,1753444
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1753460&r1=1753459&r2=1753460&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Wed Jul 20 07:05:11 2016
@@ -746,7 +746,8 @@ public class DocumentNodeStoreService {
}
};
registrations.add(WhiteboardUtils.scheduleWithFixedDelay(whiteboard,
- recoverJob, TimeUnit.MILLISECONDS.toSeconds(leaseTime)));
+ recoverJob, TimeUnit.MILLISECONDS.toSeconds(leaseTime),
+ false/*runOnSingleClusterNode*/, true /*use dedicated pool*/));
}
private void registerJournalGC(final DocumentNodeStore nodeStore) {
@@ -766,7 +767,8 @@ public class DocumentNodeStoreService {
};
registrations.add(WhiteboardUtils.scheduleWithFixedDelay(whiteboard,
- journalGCJob,
TimeUnit.MILLISECONDS.toSeconds(journalGCInterval),
true/*runOnSingleClusterNode*/));
+ journalGCJob,
TimeUnit.MILLISECONDS.toSeconds(journalGCInterval),
+ true/*runOnSingleClusterNode*/, true /*use dedicated pool*/));
}
private Object prop(String propName) {
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java?rev=1753460&r1=1753459&r2=1753460&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java
Wed Jul 20 07:05:11 2016
@@ -39,12 +39,11 @@ public class IndexMBeanRegistration impl
public void registerAsyncIndexer(AsyncIndexUpdate task, long
delayInSeconds) {
task.setIndexMBeanRegistration(this);
- regs.add(scheduleWithFixedDelay(whiteboard, task, delayInSeconds,
true));
+ regs.add(scheduleWithFixedDelay(whiteboard, task, delayInSeconds,
true, true));
regs.add(registerMBean(whiteboard, IndexStatsMBean.class,
task.getIndexStats(), IndexStatsMBean.TYPE, task.getName()));
// Register AsyncIndexStats for execution stats update
- regs.add(scheduleWithFixedDelay(whiteboard, task.getIndexStats(), 1,
- false));
+ regs.add(scheduleWithFixedDelay(whiteboard, task.getIndexStats(), 1));
}
@Override
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java?rev=1753460&r1=1753459&r2=1753460&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
Wed Jul 20 07:05:11 2016
@@ -47,11 +47,12 @@ public class WhiteboardUtils {
public static Registration scheduleWithFixedDelay(
Whiteboard whiteboard, Runnable runnable, long delayInSeconds) {
- return scheduleWithFixedDelay(whiteboard, runnable, delayInSeconds,
false);
+ return scheduleWithFixedDelay(whiteboard, runnable, delayInSeconds,
false, false);
}
public static Registration scheduleWithFixedDelay(
- Whiteboard whiteboard, Runnable runnable, long delayInSeconds,
boolean runOnSingleClusterNode) {
+ Whiteboard whiteboard, Runnable runnable, long delayInSeconds,
boolean runOnSingleClusterNode,
+ boolean useDedicatedPool) {
ImmutableMap.Builder<String, Object> builder = ImmutableMap.<String,
Object>builder()
.put("scheduler.period", delayInSeconds)
.put("scheduler.concurrent", false);
@@ -59,6 +60,10 @@ public class WhiteboardUtils {
//Make use of feature while running in Sling SLING-2979
builder.put("scheduler.runOn", "SINGLE");
}
+ if (useDedicatedPool) {
+ //Make use of dedicated threadpool SLING-5831
+ builder.put("scheduler.threadPool", "oak");
+ }
return whiteboard.register(
Runnable.class, runnable, builder.build());
}
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java?rev=1753460&r1=1753459&r2=1753460&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
Wed Jul 20 07:05:11 2016
@@ -21,6 +21,8 @@ package org.apache.jackrabbit.oak.spi.wh
import java.lang.management.ManagementFactory;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -32,7 +34,9 @@ import org.apache.jackrabbit.oak.query.Q
import org.junit.After;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
public class WhiteboardUtilsTest {
private List<Registration> regs = Lists.newArrayList();
@@ -85,6 +89,26 @@ public class WhiteboardUtilsTest {
assertNotNull(server.getObjectInstance(new
ObjectName("org.apache.jackrabbit.oak:type=query,name=settings")));
}
+ @Test
+ public void scheduledJobWithPoolName() throws Exception{
+ final AtomicReference<Map<?, ?>> props = new AtomicReference<Map<?,
?>>();
+ Whiteboard wb = new DefaultWhiteboard(){
+ @Override
+ public <T> Registration register(Class<T> type, T service, Map<?,
?> properties) {
+ props.set(properties);
+ return super.register(type, service, properties);
+ }
+ };
+
+ WhiteboardUtils.scheduleWithFixedDelay(wb, new TestRunnable(), 1,
false, true);
+ assertNotNull(props.get().get("scheduler.threadPool"));
+
+ props.set(null);
+ WhiteboardUtils.scheduleWithFixedDelay(wb, new TestRunnable(), 1,
true, false);
+ assertNull(props.get().get("scheduler.threadPool"));
+ assertEquals("SINGLE", props.get().get("scheduler.runOn"));
+ }
+
public interface HelloMBean {
boolean isRunning();
int getCount();
@@ -108,4 +132,11 @@ public class WhiteboardUtilsTest {
private static class HelloTest extends Hello {
}
+
+ private static class TestRunnable implements Runnable {
+ @Override
+ public void run() {
+
+ }
+ }
}
