Skip to content

Commit 835abe6

Browse files
committed
Revert "CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud is unusable."
This reverts commit 6df3842.
1 parent fac7bfc commit 835abe6

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,17 +255,14 @@ 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-
260258
if (s_logger.isDebugEnabled()) {
261-
s_logger.debug("Wake up jobs related to job- " + jobId);
259+
s_logger.debug("Wake up jobs related to job-" + jobId);
262260
}
263-
264261
List<Long> wakeupList = Transaction.execute(new TransactionCallback<List<Long>>() {
265262
@Override
266263
public List<Long> doInTransaction(TransactionStatus status) {
267264
if (s_logger.isDebugEnabled()) {
268-
s_logger.debug("Update db status for job- " + jobId);
265+
s_logger.debug("Update db status for job-" + jobId);
269266
}
270267
job.setCompleteMsid(getMsid());
271268
job.setStatus(jobStatus);
@@ -282,7 +279,7 @@ public List<Long> doInTransaction(TransactionStatus status) {
282279
_jobDao.update(jobId, job);
283280

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

0 commit comments

Comments
 (0)