From ca52af17ea73cd5a85a5477efba73831e783e5a9 Mon Sep 17 00:00:00 2001 From: Ahmed Owian Date: Thu, 20 Feb 2014 20:06:28 +0000 Subject: [PATCH] ACE-403 Added property-configured startDelayMinutes with default of 10 minutes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../caching-content-store-context.xml.sample | 3 +++ ...ontent-expiration-debug-context.xml.sample | 3 +++ ...loyment-attempt-cleaner-context.xml.sample | 5 +++- config/alfresco/repository.properties | 5 +++- config/alfresco/scheduled-jobs-context.xml | 24 +++++++++++++++++++ .../default/activities-jobs-context.xml | 15 ++++++++++++ .../default/activities-jobs.properties | 6 ++++- .../default/openoffice-transform-context.xml | 3 +++ .../Search/lucene/index-recovery-context.xml | 11 ++++++++- .../Search/lucene/scheduled-jobs-context.xml | 3 +++ .../Search/solr/solr-backup-context.xml | 6 +++++ .../default-synchronization-context.xml | 3 +++ .../default/network-protocol-context.xml | 3 +++ 13 files changed, 86 insertions(+), 4 deletions(-) diff --git a/config/alfresco/extension/caching-content-store-context.xml.sample b/config/alfresco/extension/caching-content-store-context.xml.sample index 279f59e24f..d3f34492e6 100644 --- a/config/alfresco/extension/caching-content-store-context.xml.sample +++ b/config/alfresco/extension/caching-content-store-context.xml.sample @@ -100,5 +100,8 @@ ${system.content.caching.contentCleanup.cronExpression} + + ${system.cronJob.startDelayMinutes} + diff --git a/config/alfresco/extension/content-expiration-debug-context.xml.sample b/config/alfresco/extension/content-expiration-debug-context.xml.sample index 84ceb4c050..99f4c44834 100644 --- a/config/alfresco/extension/content-expiration-debug-context.xml.sample +++ b/config/alfresco/extension/content-expiration-debug-context.xml.sample @@ -24,5 +24,8 @@ 0 0/2 * * * ? + + ${system.cronJob.startDelayMinutes} + diff --git a/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample b/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample index 357abf646d..d202afb7b5 100644 --- a/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample +++ b/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample @@ -49,6 +49,9 @@ that are older than 180 days. 0 0 4 * * ? + + ${system.cronJob.startDelayMinutes} + - \ No newline at end of file + diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties index 6af89d5c70..0d628110b4 100644 --- a/config/alfresco/repository.properties +++ b/config/alfresco/repository.properties @@ -1083,4 +1083,7 @@ system.patch.sharedFolder.cronExpression=0 0 0 ? 1 1 2030 # # Use a canned query when requested to search for people if " [hint:useCQ]" is provided in search term # -people.search.honor.hint.useCQ=true \ No newline at end of file +people.search.honor.hint.useCQ=true + +# Delays cron jobs after bootstrap to allow server to fully come up before jobs start +system.cronJob.startDelayMinutes=10 \ No newline at end of file diff --git a/config/alfresco/scheduled-jobs-context.xml b/config/alfresco/scheduled-jobs-context.xml index cf273d9532..e7536e611c 100644 --- a/config/alfresco/scheduled-jobs-context.xml +++ b/config/alfresco/scheduled-jobs-context.xml @@ -31,6 +31,9 @@ 0 30 * * * ? + + ${system.cronJob.startDelayMinutes} + @@ -55,6 +58,9 @@ ${system.content.orphanCleanup.cronExpression} + + ${system.cronJob.startDelayMinutes} + @@ -79,6 +85,9 @@ ${system.content.contentUrlConverter.cronExpression} + + ${system.cronJob.startDelayMinutes} + @@ -103,6 +112,9 @@ ${system.patch.sharedFolder.cronExpression} + + ${system.cronJob.startDelayMinutes} + @@ -127,6 +139,9 @@ 0 0 21 * * ? + + ${system.cronJob.startDelayMinutes} + @@ -147,6 +162,9 @@ + + ${system.cronJob.startDelayMinutes} + @@ -175,6 +193,9 @@ ${version.store.migrateVersionStore.cronExpression} + + ${system.cronJob.startDelayMinutes} + @@ -286,6 +307,9 @@ ${ticket.cleanup.cronExpression} + + ${system.cronJob.startDelayMinutes} + diff --git a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml index efd3647ef9..52b07ccd3a 100644 --- a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml +++ b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml @@ -23,6 +23,9 @@ + + ${activities.feed.cleaner.startDelayMins} + @@ -45,6 +48,9 @@ + + ${activities.feed.generator.startDelayMins} + @@ -66,6 +72,9 @@ + + ${activities.post.lookup.startDelayMins} + @@ -88,6 +97,9 @@ + + ${activities.post.cleaner.startDelayMins} + @@ -113,6 +125,9 @@ + + ${activities.feed.notifier.startDelayMins} + diff --git a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties index b24c6cccc1..c18bd217e0 100644 --- a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties +++ b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties @@ -8,7 +8,7 @@ activities.feed.max.ageMins=44640 # please note: # - refer to "email/OutboundSMTP" subsystem for SMTP properties (mail.*) # - refer to "sysAdmin" subsystem for Share url/ctx properties (share.*) -activities.feed.notifier.startDelayMins=0 +activities.feed.notifier.startDelayMins=${system.cronJob.startDelayMinutes} # Feed notification period (every 24 hours at 00:00) activities.feed.notifier.cronExpression=0 0 0 * * ? activities.feed.notifier.enabled=true @@ -17,20 +17,24 @@ activities.feed.notifier.emailTemplatePath=/app:company_home/app:dictionary/app: activities.feed.notifier.emailTemplateLocationType=xpath # activities feed generator +activities.feed.generator.startDelayMins=${system.cronJob.startDelayMinutes} activities.feed.generator.cronExpression=0/30 * * * * ? activities.feed.generator.maxItemsPerCycle=100 activities.feed.generator.enabled=true # activities feed cleaner +activities.feed.cleaner.startDelayMins=${system.cronJob.startDelayMinutes} # repeat every 10 mins activities.feed.cleaner.cronExpression=0 0/10 * * * ? activities.feed.cleaner.enabled=true # activities post cleaner +activities.post.cleaner.startDelayMins=${system.cronJob.startDelayMinutes} activities.post.cleaner.cronExpression=0 0/10 * * * ? activities.post.cleaner.enabled=true # activities post lookup +activities.post.lookup.startDelayMins=${system.cronJob.startDelayMinutes} activities.post.lookup.cronExpression=0/15 * * * * ? activities.post.lookup.maxItemsPerCycle=500 activities.post.lookup.enabled=true \ No newline at end of file diff --git a/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml b/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml index 9d6875bcb5..cc2046caa2 100644 --- a/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml +++ b/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml @@ -119,6 +119,9 @@ + + ${system.cronJob.startDelayMinutes} + diff --git a/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml b/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml index c39a65db03..3a22899ff6 100644 --- a/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml +++ b/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml @@ -146,6 +146,9 @@ ${index.tracking.adm.cronExpression} + + ${system.cronJob.startDelayMinutes} + @@ -187,6 +190,9 @@ ${index.tracking.avm.cronExpression} + + ${system.cronJob.startDelayMinutes} + @@ -228,8 +234,11 @@ ${index.reindexMissingContent.cronExpression} + + ${system.cronJob.startDelayMinutes} + - \ No newline at end of file + diff --git a/config/alfresco/subsystems/Search/lucene/scheduled-jobs-context.xml b/config/alfresco/subsystems/Search/lucene/scheduled-jobs-context.xml index 8d9c8f2620..53314baca4 100644 --- a/config/alfresco/subsystems/Search/lucene/scheduled-jobs-context.xml +++ b/config/alfresco/subsystems/Search/lucene/scheduled-jobs-context.xml @@ -56,6 +56,9 @@ ${index.backup.cronExpression} + + ${system.cronJob.startDelayMinutes} + diff --git a/config/alfresco/subsystems/Search/solr/solr-backup-context.xml b/config/alfresco/subsystems/Search/solr/solr-backup-context.xml index 97a89999fa..1c3bfb8cf0 100644 --- a/config/alfresco/subsystems/Search/solr/solr-backup-context.xml +++ b/config/alfresco/subsystems/Search/solr/solr-backup-context.xml @@ -28,6 +28,9 @@ ${solr.backup.alfresco.cronExpression} + + ${system.cronJob.startDelayMinutes} + @@ -74,6 +77,9 @@ ${solr.backup.archive.cronExpression} + + ${system.cronJob.startDelayMinutes} + diff --git a/config/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml b/config/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml index f9a5290c26..6599e9047c 100644 --- a/config/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml +++ b/config/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml @@ -31,6 +31,9 @@ + + ${system.cronJob.startDelayMinutes} + diff --git a/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml b/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml index f5525cecd1..281754ea96 100644 --- a/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml +++ b/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml @@ -102,6 +102,9 @@ ${filesystem.lockKeeperRefreshCronExpression} + + ${system.cronJob.startDelayMinutes} +