You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/20 14:38:10 UTC
[1/2] git commit: updated refs/heads/master to 1bfba70
Repository: cloudstack
Updated Branches:
refs/heads/master 6f9215cf3 -> 1bfba70b6
CLOUDSTACK-9195: Cancelled/failed async jobs not getting cleaned up from DB
Setting 'job_complete_msid' field in async_job table when marking job as cancelled during MS restart.
This will ensure that the job is cleaned up as part of GC thread.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a6f9181e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a6f9181e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a6f9181e
Branch: refs/heads/master
Commit: a6f9181ee15c64ce6358be855f2f5474ca1cb7ef
Parents: 7e12ebf
Author: Koushik Das <ko...@apache.org>
Authored: Tue Dec 22 13:53:29 2015 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Tue Dec 22 13:53:29 2015 +0530
----------------------------------------------------------------------
.../apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a6f9181e/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
----------------------------------------------------------------------
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 3e1ed9c..121246b 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
@@ -1006,6 +1006,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
job.setStatus(JobInfo.Status.FAILED);
job.setResultCode(ApiErrorCode.INTERNAL_ERROR.getHttpCode());
job.setResult("job cancelled because of management server restart or shutdown");
+ job.setCompleteMsid(msid);
_jobDao.update(job.getId(), job);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Purge queue item for cancelled job-" + job.getId());
[2/2] git commit: updated refs/heads/master to 1bfba70
Posted by re...@apache.org.
Merge pull request #1272 from koushik-das/CLOUDSTACK-9195
CLOUDSTACK-9195: Cancelled/failed async jobs not getting cleaned up from DB
Setting 'job_complete_msid' field in async_job table when marking job as cancelled during MS restart.
This will ensure that the job is cleaned up as part of GC thread.
* pr/1272:
CLOUDSTACK-9195: Cancelled/failed async jobs not getting cleaned up from DB Setting 'job_complete_msid' field in async_job table when marking job as cancelled during MS restart. This will ensure that the job is cleaned up as part of GC thread.
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1bfba70b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1bfba70b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1bfba70b
Branch: refs/heads/master
Commit: 1bfba70b62503d31dc43006783725654656c1112
Parents: 6f9215c a6f9181
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Jan 20 14:37:37 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Jan 20 14:37:37 2016 +0100
----------------------------------------------------------------------
.../apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------