You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/03/25 20:05:50 UTC
git commit: updated refs/heads/4.4 to 31d22c1
Repository: cloudstack
Updated Branches:
refs/heads/4.4 40cf807bd -> 31d22c1b1
use correct interval for cleanTask and transitionTask
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/31d22c1b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/31d22c1b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/31d22c1b
Branch: refs/heads/4.4
Commit: 31d22c1b16bf3e48394672bff47fc2b1dec547f0
Parents: 40cf807
Author: Anthony Xu <an...@citrix.com>
Authored: Tue Mar 25 12:04:51 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Tue Mar 25 12:05:31 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31d22c1b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 5c449ca..6f71306 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -569,8 +569,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
@Override
public boolean start() {
// TODO, initial delay is hardcoded
- _executor.scheduleAtFixedRate(new TransitionTask(), 5000, VmJobStateReportInterval.value(), TimeUnit.SECONDS);
- _executor.scheduleAtFixedRate(new CleanupTask(), VmOpCleanupInterval.value(), VmOpCleanupInterval.value(), TimeUnit.SECONDS);
+ _executor.scheduleAtFixedRate(new CleanupTask(), 5000, VmJobStateReportInterval.value(), TimeUnit.SECONDS);
+ _executor.scheduleAtFixedRate(new TransitionTask(), VmOpCleanupInterval.value(), VmOpCleanupInterval.value(), TimeUnit.SECONDS);
cancelWorkItems(_nodeId);
// cleanup left over place holder works