You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2021/01/11 18:18:56 UTC
[sling-whiteboard] 02/02: Setting to not run concurrently
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit b314639ec0a06fe9774ef2924213e684e8d4c126
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Jan 11 13:18:37 2021 -0500
Setting to not run concurrently
---
.../jcr/repositorymaintenance/internal/DataStoreCleanupScheduler.java | 3 ++-
.../jcr/repositorymaintenance/internal/RevisionCleanupScheduler.java | 3 ++-
.../sling/jcr/repositorymaintenance/internal/VersionCleanup.java | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/DataStoreCleanupScheduler.java b/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/DataStoreCleanupScheduler.java
index e5322d3..e23dc46 100644
--- a/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/DataStoreCleanupScheduler.java
+++ b/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/DataStoreCleanupScheduler.java
@@ -31,7 +31,8 @@ import org.slf4j.LoggerFactory;
/**
* Service for running the Jackrabbit OAK Blob Store cleanup on a schedule.
*/
-@Component(service = { Runnable.class }, configurationPolicy = ConfigurationPolicy.REQUIRE, immediate = true)
+@Component(service = { Runnable.class }, property = {
+ "scheduler.concurrent:Boolean=false" }, configurationPolicy = ConfigurationPolicy.REQUIRE, immediate = true)
@Designate(ocd = DataStoreCleanupConfig.class)
public class DataStoreCleanupScheduler implements RunnableJob {
diff --git a/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/RevisionCleanupScheduler.java b/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/RevisionCleanupScheduler.java
index f0d230f..18e0ae0 100644
--- a/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/RevisionCleanupScheduler.java
+++ b/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/RevisionCleanupScheduler.java
@@ -31,7 +31,8 @@ import org.slf4j.LoggerFactory;
/**
* Service for running the Jackrabbit OAK Segment Store cleanup on a schedule.
*/
-@Component(service = { Runnable.class }, configurationPolicy = ConfigurationPolicy.REQUIRE, immediate = true)
+@Component(service = { Runnable.class }, property = {
+ "scheduler.concurrent:Boolean=false" }, configurationPolicy = ConfigurationPolicy.REQUIRE, immediate = true)
@Designate(ocd = RevisionCleanupConfig.class)
public class RevisionCleanupScheduler implements RunnableJob {
diff --git a/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/VersionCleanup.java b/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/VersionCleanup.java
index ecf4331..5ed5ef9 100644
--- a/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/VersionCleanup.java
+++ b/org.apache.sling.jcr.repositorymaintainance/src/main/java/org/apache/sling/jcr/repositorymaintenance/internal/VersionCleanup.java
@@ -52,7 +52,8 @@ import org.slf4j.LoggerFactory;
*
*/
@Component(service = { VersionCleanupMBean.class, Runnable.class, DynamicMBean.class }, property = {
- "jmx.objectname=org.apache.sling.jcr.repositorymaintenance:type=VersionCleanup" }, configurationPolicy = ConfigurationPolicy.REQUIRE, immediate = true)
+ "jmx.objectname=org.apache.sling.jcr.repositorymaintenance:type=VersionCleanup",
+ "scheduler.concurrent:Boolean=false" }, configurationPolicy = ConfigurationPolicy.REQUIRE, immediate = true)
@Designate(ocd = VersionCleanupConfig.class)
public class VersionCleanup extends AnnotatedStandardMBean implements Runnable, VersionCleanupMBean {
@@ -169,6 +170,7 @@ public class VersionCleanup extends AnnotatedStandardMBean implements Runnable,
}
private void doRun() {
+ log.info("Running version cleanup");
boolean interrupted = false;
boolean succeeded = false;
String failureMessage = null;