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
2025-08-07 17:49:17 +00:00 · 2014-02-20 20:06:28 +00:00
parent 4707e6cd48
commit ca52af17ea
13 changed files with 86 additions and 4 deletions
--- a/config/alfresco/extension/caching-content-store-context.xml.sample
+++ b/config/alfresco/extension/caching-content-store-context.xml.sample
@@ -100,5 +100,8 @@
        <property name="cronExpression">
            <value>${system.content.caching.contentCleanup.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>    
 </beans>
--- a/config/alfresco/extension/content-expiration-debug-context.xml.sample
+++ b/config/alfresco/extension/content-expiration-debug-context.xml.sample
@@ -24,5 +24,8 @@
        <property name="cronExpression">
            <value>0 0/2 * * * ?</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
 </beans>
--- 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.
        <property name="cronExpression">
            <value>0 0 4 * * ?</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
-</beans>
+</beans>
--- 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
+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
--- a/config/alfresco/scheduled-jobs-context.xml
+++ b/config/alfresco/scheduled-jobs-context.xml
@@ -31,6 +31,9 @@
        <property name="cronExpression">
            <value>0 30 * * * ?</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>

    <bean id="contentStoreCleanerJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
@@ -55,6 +58,9 @@
        <property name="cronExpression">
            <value>${system.content.orphanCleanup.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>

    <bean id="contentUrlConverterJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
@@ -79,6 +85,9 @@
        <property name="cronExpression">
            <value>${system.content.contentUrlConverter.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
    <bean id="patchSharedFolderJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
@@ -103,6 +112,9 @@
        <property name="cronExpression">
            <value>${system.patch.sharedFolder.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>

    <bean id="nodeServiceCleanupJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
@@ -127,6 +139,9 @@
        <property name="cronExpression">
            <value>0 0 21 * * ?</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
    <!-- enable scheduler property to activate -->
@@ -147,6 +162,9 @@
        </property>
        <property name="scheduler" ref="schedulerFactory" />
        <property name="cronExpression" value="0 0/5 * * * ?" />            <!-- run every 5 minutes -->
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
    <!--  note: Activities (feed) jobs have moved to Activities subsystem (since 3.5) -->
@@ -175,6 +193,9 @@
        <property name="cronExpression">
            <value>${version.store.migrateVersionStore.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
    <!-- enable scheduler property to activate -->
@@ -286,6 +307,9 @@
        <property name="cronExpression">
            <value>${ticket.cleanup.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
 </beans>
--- a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
+++ b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
@@ -23,6 +23,9 @@
        <property name="scheduler" ref="schedulerFactory" />
        <property name="cronExpression" value="${activities.feed.cleaner.cronExpression}" />
        <property name="enabled" value="${activities.feed.cleaner.enabled}" />
+        <property name="startDelayMinutes">
+        	<value>${activities.feed.cleaner.startDelayMins}</value>
+       	</property>
    </bean>
    
    <!-- Activities Feed Generator -->
@@ -45,6 +48,9 @@
        <property name="scheduler" ref="schedulerFactory" />
        <property name="cronExpression" value="${activities.feed.generator.cronExpression}" />
        <property name="enabled" value="${activities.feed.generator.enabled}" />
+        <property name="startDelayMinutes">
+        	<value>${activities.feed.generator.startDelayMins}</value>
+       	</property>
    </bean>
    
    <!-- Activities Post Lookup (for secondary lookup) -->
@@ -66,6 +72,9 @@
        <property name="scheduler" ref="schedulerFactory" />
        <property name="cronExpression" value="${activities.post.lookup.cronExpression}" />
        <property name="enabled" value="${activities.post.lookup.enabled}" />
+        <property name="startDelayMinutes">
+        	<value>${activities.post.lookup.startDelayMins}</value>
+       	</property>
    </bean>
    
    <!-- Activities Post Cleaner -->
@@ -88,6 +97,9 @@
        <property name="scheduler" ref="schedulerFactory" />
        <property name="cronExpression" value="${activities.post.cleaner.cronExpression}" />
        <property name="enabled" value="${activities.post.cleaner.enabled}" />
+        <property name="startDelayMinutes">
+        	<value>${activities.post.cleaner.startDelayMins}</value>
+       	</property>
    </bean>
    
     <!-- Activities Email Notifier -->
@@ -113,6 +125,9 @@
        <property name="scheduler" ref="schedulerFactory" />
        <property name="cronExpression" value="${activities.feed.notifier.cronExpression}" />
        <property name="enabled" value="${activities.feed.notifier.enabled}" />
+        <property name="startDelayMinutes">
+        	<value>${activities.feed.notifier.startDelayMins}</value>
+       	</property>
    </bean>
    
 </beans>
--- 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
--- a/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
+++ b/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
@@ -119,6 +119,9 @@
      <property name="enabledFromBean">
         <ref bean="startListener" />
      </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
   </bean>

   <bean id="extracter.worker.OpenOffice" class="org.alfresco.repo.content.metadata.DefaultOpenOfficeMetadataWorker">
--- a/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml
+++ b/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml
@@ -146,6 +146,9 @@
        <property name="cronExpression">
            <value>${index.tracking.adm.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>

    <!--===========================-->
@@ -187,6 +190,9 @@
        <property name="cronExpression">
            <value>${index.tracking.avm.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
   <!-- Failed FTS reindexer -->
@@ -228,8 +234,11 @@
        <property name="cronExpression">
            <value>${index.reindexMissingContent.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
    <!-- Add enterprise clustering configuration when available. -->
    <import resource="classpath*:alfresco/enterprise/cluster/index-recovery-overrides.xml"/>
-</beans>
+</beans>
--- a/config/alfresco/subsystems/Search/lucene/scheduled-jobs-context.xml
+++ b/config/alfresco/subsystems/Search/lucene/scheduled-jobs-context.xml
@@ -56,6 +56,9 @@
        <property name="cronExpression">
            <value>${index.backup.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>

 
--- a/config/alfresco/subsystems/Search/solr/solr-backup-context.xml
+++ b/config/alfresco/subsystems/Search/solr/solr-backup-context.xml
@@ -28,6 +28,9 @@
        <property name="cronExpression">
            <value>${solr.backup.alfresco.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
    <bean id="search.alfrescoCoreSolrBackupClient" class="org.alfresco.repo.search.impl.solr.SolrBackupClient" >
@@ -74,6 +77,9 @@
        <property name="cronExpression">
            <value>${solr.backup.archive.cronExpression}</value>
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>
    
    <bean id="search.archiveCoreSolrBackupClient" class="org.alfresco.repo.search.impl.solr.SolrBackupClient" >
--- a/config/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml
+++ b/config/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml
@@ -31,6 +31,9 @@
        <property name="scheduler">
            <ref bean="schedulerFactory" />
        </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>

    <!-- The chaining user registry synchronizer -->
--- a/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
+++ b/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
@@ -102,6 +102,9 @@
      <property name="cronExpression">
         <value>${filesystem.lockKeeperRefreshCronExpression}</value>
      </property>
+        <property name="startDelayMinutes">
+        	<value>${system.cronJob.startDelayMinutes}</value>
+       	</property>
    </bean>