Skip to content

Commit 6df3842

Browse files
minchen07yadvr
authored andcommitted
CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud is unusable.
(cherry picked from commit a2d85c8) Signed-off-by: Rohit Yadav <[email protected]> Conflicts: framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
1 parent 95daa14 commit 6df3842

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,17 @@ public void completeAsyncJob(final long jobId, final Status jobStatus, final int
255255
s_logger.debug("Publish async job-" + jobId + " complete on message bus");
256256
}
257257

258+
publishOnEventBus(job, "complete"); // publish before the instance type and ID are wiped out
259+
258260
if (s_logger.isDebugEnabled()) {
259-
s_logger.debug("Wake up jobs related to job-" + jobId);
261+
s_logger.debug("Wake up jobs related to job- " + jobId);
260262
}
263+
261264
List<Long> wakeupList = Transaction.execute(new TransactionCallback<List<Long>>() {
262265
@Override
263266
public List<Long> doInTransaction(TransactionStatus status) {
264267
if (s_logger.isDebugEnabled()) {
265-
s_logger.debug("Update db status for job-" + jobId);
268+
s_logger.debug("Update db status for job- " + jobId);
266269
}
267270
job.setCompleteMsid(getMsid());
268271
job.setStatus(jobStatus);
@@ -279,7 +282,7 @@ public List<Long> doInTransaction(TransactionStatus status) {
279282
_jobDao.update(jobId, job);
280283

281284
if (s_logger.isDebugEnabled()) {
282-
s_logger.debug("Wake up jobs joined with job-" + jobId + " and disjoin all subjobs created from job- " + jobId);
285+
s_logger.debug("Wake up jobs joined with job- " + jobId + " and disjoin all subjobs created from job- " + jobId);
283286
}
284287
List<Long> wakeupList = wakeupByJoinedJobCompletion(jobId);
285288
_joinMapDao.disjoinAllJobs(jobId);

0 commit comments

Comments
 (0)