Repository: cloudstack Updated Branches: refs/heads/master b592e0af3 -> 4317a85e9
CLOUDSTACK-7628:VM Worker job should be expunged one hour after completion instead of currently being expunged whenever cleanup task thread is run. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4317a85e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4317a85e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4317a85e Branch: refs/heads/master Commit: 4317a85e97643c681b98b3e58990ec2f22abedd8 Parents: b592e0a Author: Min Chen <min.c...@citrix.com> Authored: Wed Sep 24 17:27:39 2014 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Wed Sep 24 17:27:39 2014 -0700 ---------------------------------------------------------------------- .../org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4317a85e/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java ---------------------------------------------------------------------- diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java index ee8748a..d38de0e 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java @@ -140,7 +140,7 @@ public class VmWorkJobDaoImpl extends GenericDaoBase<VmWorkJobVO, Long> implemen // loop at application level to avoid mysql deadlock issues SearchCriteria<VmWorkJobVO> sc = ExpungingWorkJobSearch.create(); sc.setParameters("jobStatus", JobInfo.Status.IN_PROGRESS); - sc.setParameters("lastUpdated", cutDate); + sc.setParameters("cutDate", cutDate); sc.setParameters("dispatcher", "VmWorkJobDispatcher"); List<VmWorkJobVO> expungeList = listBy(sc); for (VmWorkJobVO job : expungeList) {
