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:54 UTC
[sling-whiteboard] branch master updated (b7094cb -> b314639)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git.
from b7094cb Fixing issues with my ability to spell, making package naming consistent, ensuring configs are in the correct order and getting all of the path configurations
new 2ce3f1a Adding the service user mapping to the feature configuration
new b314639 Setting to not run concurrently
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/features/base.json | 7 +++++++
.../repositorymaintenance/internal/DataStoreCleanupScheduler.java | 3 ++-
.../repositorymaintenance/internal/RevisionCleanupScheduler.java | 3 ++-
.../sling/jcr/repositorymaintenance/internal/VersionCleanup.java | 4 +++-
4 files changed, 14 insertions(+), 3 deletions(-)
[sling-whiteboard] 01/02: Adding the service user mapping to the
feature configuration
Posted by dk...@apache.org.
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 2ce3f1aeb09b18f31fb4a3b3e693697a28571738
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Jan 11 12:52:34 2021 -0500
Adding the service user mapping to the feature configuration
---
.../src/main/features/base.json | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/org.apache.sling.jcr.repositorymaintainance/src/main/features/base.json b/org.apache.sling.jcr.repositorymaintainance/src/main/features/base.json
index 20c7ea7..43f353e 100644
--- a/org.apache.sling.jcr.repositorymaintainance/src/main/features/base.json
+++ b/org.apache.sling.jcr.repositorymaintainance/src/main/features/base.json
@@ -5,6 +5,13 @@
"start-order": "20"
}
],
+ "configurations":{
+ "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-versionmgr":{
+ "user.mapping":[
+ "org.apache.sling.jcr.repositorymaintainance:sling-versionmgr=sling-versionmgr"
+ ]
+ }
+ },
"repoinit:TEXT|true": [
"create service user sling-versionmgr",
"set ACL for sling-versionmgr",
[sling-whiteboard] 02/02: Setting to not run concurrently
Posted by dk...@apache.org.
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;