From 835abe6c7c98fd3db6af65597d0c7e9c48bb034e Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 4 Dec 2014 02:38:47 +0530 Subject: [PATCH] Revert "CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud is unusable." This reverts commit 6df38427cffe9cab5a2a842571941a97a3a07b52. --- .../framework/jobs/impl/AsyncJobManagerImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java index 63a5864d993..bdc7cb0bfc4 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java @@ -255,17 +255,14 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, s_logger.debug("Publish async job-" + jobId + " complete on message bus"); } - publishOnEventBus(job, "complete"); // publish before the instance type and ID are wiped out - if (s_logger.isDebugEnabled()) { - s_logger.debug("Wake up jobs related to job- " + jobId); + s_logger.debug("Wake up jobs related to job-" + jobId); } - List wakeupList = Transaction.execute(new TransactionCallback>() { @Override public List doInTransaction(TransactionStatus status) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Update db status for job- " + jobId); + s_logger.debug("Update db status for job-" + jobId); } job.setCompleteMsid(getMsid()); job.setStatus(jobStatus); @@ -282,7 +279,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, _jobDao.update(jobId, job); if (s_logger.isDebugEnabled()) { - s_logger.debug("Wake up jobs joined with job- " + jobId + " and disjoin all subjobs created from job- " + jobId); + s_logger.debug("Wake up jobs joined with job-" + jobId + " and disjoin all subjobs created from job- " + jobId); } List wakeupList = wakeupByJoinedJobCompletion(jobId); _joinMapDao.disjoinAllJobs(jobId);