diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index a0abb2628e3..7579362c6f5 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -335,8 +335,11 @@ public class AsyncJobManagerImpl implements AsyncJobManager { s_logger.trace("Executing " + executor.getClass().getName() + " returns true for job-" + jobId); if(executor.getSyncSource() != null) { - _queueMgr.purgeItem(executor.getSyncSource().getId()); - checkQueue(executor.getSyncSource().getQueueId()); + _queueMgr.purgeItem(executor.getSyncSource().getId()); + + // avoid kicking the queue inside job execution context to maintain better transaction + // boundaries between job executions + // checkQueue(executor.getSyncSource().getQueueId()); } } else { if(s_logger.isTraceEnabled()) @@ -353,7 +356,9 @@ public class AsyncJobManagerImpl implements AsyncJobManager { if(executor.getSyncSource() != null) { _queueMgr.purgeItem(executor.getSyncSource().getId()); - checkQueue(executor.getSyncSource().getQueueId()); + // avoid kicking the queue inside job execution context to maintain better transaction + // boundaries between job executions + // checkQueue(executor.getSyncSource().getQueueId()); } } catch(Throwable ex) { s_logger.fatal("Exception on exception, log it for record", ex); @@ -379,7 +384,7 @@ public class AsyncJobManagerImpl implements AsyncJobManager { _queueMgr.purgeItem(item.getId()); } else { if(s_logger.isDebugEnabled()) - s_logger.debug("Schedule queued job-" + job.getId()); + s_logger.debug("Schedule queued job-" + job.getId() + " for execution"); executor.setFromPreviousSession(fromPreviousSession); executor.setSyncSource(item); @@ -402,8 +407,10 @@ public class AsyncJobManagerImpl implements AsyncJobManager { + executor.getSyncSource().getContentType() + "-" + executor.getSyncSource().getContentId()); - _queueMgr.purgeItem(executor.getSyncSource().getId()); - checkQueue(executor.getSyncSource().getQueueId()); + _queueMgr.purgeItem(executor.getSyncSource().getId()); + + // avoid kicking the queue inside job execution context + // checkQueue(executor.getSyncSource().getQueueId()); } } diff --git a/server/src/com/cloud/async/SyncQueueManagerImpl.java b/server/src/com/cloud/async/SyncQueueManagerImpl.java index 9a87cb39f68..051540d1aed 100644 --- a/server/src/com/cloud/async/SyncQueueManagerImpl.java +++ b/server/src/com/cloud/async/SyncQueueManagerImpl.java @@ -119,7 +119,7 @@ public class SyncQueueManagerImpl implements SyncQueueManager { } } else { if(s_logger.isDebugEnabled()) - s_logger.debug("There is a pending process in sync queue(id: " + queueId + ")"); + s_logger.debug("There is a pending process in sync queue(queue id: " + queueId + ")"); } txt.commit(); } catch(Exception e) {