MainObjectReaperJob.java (eucalyptus-4.4.1) | : | MainObjectReaperJob.java (eucalyptus-4.4.2) | ||
---|---|---|---|---|
skipping to change at line 66 | skipping to change at line 66 | |||
* SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, | * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, | |||
* WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, | * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, | |||
* REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO | * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO | |||
* IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT | * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT | |||
* NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. | * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. | |||
************************************************************************/ | ************************************************************************/ | |||
package com.eucalyptus.objectstorage.jobs; | package com.eucalyptus.objectstorage.jobs; | |||
import org.apache.log4j.Logger; | import org.apache.log4j.Logger; | |||
import org.quartz.DisallowConcurrentExecution; | ||||
import org.quartz.InterruptableJob; | import org.quartz.InterruptableJob; | |||
import org.quartz.JobExecutionContext; | import org.quartz.JobExecutionContext; | |||
import org.quartz.JobExecutionException; | import org.quartz.JobExecutionException; | |||
import org.quartz.UnableToInterruptJobException; | import org.quartz.UnableToInterruptJobException; | |||
import com.eucalyptus.bootstrap.Databases; | import com.eucalyptus.bootstrap.Databases; | |||
import com.eucalyptus.objectstorage.asynctask.ObjectReaperTask; | import com.eucalyptus.objectstorage.asynctask.ObjectReaperTask; | |||
/* | /* | |||
* | * | |||
*/ | */ | |||
@DisallowConcurrentExecution | ||||
public class MainObjectReaperJob implements InterruptableJob { | public class MainObjectReaperJob implements InterruptableJob { | |||
private static Logger LOG = Logger.getLogger(MainObjectReaperJob.class); | private static final Logger LOG = Logger.getLogger(MainObjectReaperJob.class); | |||
static final ObjectReaperTask reaper = new ObjectReaperTask(); | private static final ObjectReaperTask reaper = new ObjectReaperTask(); | |||
@Override | @Override | |||
public void execute(JobExecutionContext context) throws JobExecutionException { | public void execute(JobExecutionContext context) throws JobExecutionException { | |||
if ( Databases.isVolatile( ) ) { | if ( Databases.isVolatile( ) ) { | |||
LOG.warn( "Skipping job due to database not available" ); | LOG.warn( "Skipping job due to database not available" ); | |||
return; | return; | |||
} | } | |||
reaper.resume(); | reaper.resume(); | |||
reaper.run(); | reaper.run(); | |||
} | } | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 4 lines changed or added |