inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV to HEAD

Browse Source 
32207: Fix ALF-11644: AVM cleanup jobs run when WCM is not installed
          - Moved scheduled jobs to installable wcm-bootstrap-context.xml
          - Also got rid of orphan reaper warnings when running in a cluster (not ALF-11720, but mentioned in it)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-11-27 20:09:57 +00:00
parent c4c2ea52e9
commit ec242b6090
2 changed files with 3 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
config/alfresco/scheduled-jobs-context.xml
View File

@@ -128,57 +128,6 @@
</property> </property>
</bean> </bean>
<bean id="avmOrphanReaperJob" class="org.alfresco.util.TriggerBean">
<property name="jobDetail">
<bean id="avmOrphanReaperJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
<property name="jobClass">
<value>org.alfresco.repo.avm.OrphanReaperJob</value>
</property>
<property name="jobDataAsMap">
<map>
<entry key="orphanReaper">
<ref bean="orphanReaper"/>
</entry>
</map>
</property>
</bean>
</property>
<property name="scheduler">
<ref bean="schedulerFactory"/>
</property>
<property name="startDelayMinutes">
<value>1</value>
</property>
<property name="repeatIntervalMinutes">
<value>1</value>
</property>
</bean>
<!-- Job to scan for expired content in website staging areas -->
<bean id="avmExpiredContentTrigger" class="org.alfresco.util.CronTriggerBean">
<property name="jobDetail">
<bean id="avmExpiredContentJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
<property name="jobClass">
<value>org.alfresco.repo.avm.AVMExpiredContentJob</value>
</property>
<property name="jobDataAsMap">
<map>
<entry key="expiredContentProcessor">
<ref bean="avmExpiredContentProcessor" />
</entry>
</map>
</property>
</bean>
</property>
<property name="scheduler">
<ref bean="schedulerFactory" />
</property>
<!-- trigger at 3:30am each day -->
<property name="cronExpression">
<value>0 30 3 * * ?</value>
</property>
</bean>
<!-- enable scheduler property to activate --> <!-- enable scheduler property to activate -->
<bean id="userUsageCollapseJob" class="org.alfresco.util.TriggerBean"> <bean id="userUsageCollapseJob" class="org.alfresco.util.TriggerBean">
<property name="jobDetail"> <property name="jobDetail">
@@ -212,12 +161,6 @@
</bean> </bean>
<!-- There is a job available to purge old deploymentattempt nodes -->
<!-- from the repository. The maximum age of the node can be configured. -->
<!-- See the wiki (http://wiki.alfresco.com/wikiDeployment) for details -->
<!-- and the deployment-attempt-cleaner-context.xml.sample file. -->
<!-- note: Activities (feed) jobs have moved to Activities subsystem (since 3.5) --> <!-- note: Activities (feed) jobs have moved to Activities subsystem (since 3.5) -->

4
source/java/org/alfresco/repo/avm/OrphanReaper.java
View File

@@ -288,7 +288,7 @@ public class OrphanReaper
String lockToken = getLock(20000L); String lockToken = getLock(20000L);
if (lockToken == null) if (lockToken == null)
{ {
fgLogger.warn("Can't get lock. Assume multiple reapers ..."); fgLogger.info("Can't get lock. Assume multiple reapers ...");
fActive = false; fActive = false;
return null; return null;
} }
@@ -437,6 +437,8 @@ public class OrphanReaper
reapCnt++; reapCnt++;
} }
jobLockService.releaseLock(lockToken, LOCK);
if (fgLogger.isDebugEnabled()) if (fgLogger.isDebugEnabled())
{ {
fgLogger.debug("Reaped "+reapCnt+" nodes in "+(System.currentTimeMillis()-start)+" msecs"); fgLogger.debug("Reaped "+reapCnt+" nodes in "+(System.currentTimeMillis()-start)+" msecs");