VirtualMachineManager.checkWorkItems() uses wrong time unit
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6e12e33 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6e12e33 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6e12e33 Branch: refs/heads/master Commit: e6e12e33de394f39acd9e88e3e1d8cbe59d8474c Parents: dfb9f49 Author: Kelven Yang <[email protected]> Authored: Fri Feb 7 15:42:11 2014 -0800 Committer: Kelven Yang <[email protected]> Committed: Fri Feb 28 15:35:58 2014 -0800 ---------------------------------------------------------------------- .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6e12e33/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 246b43a..a99c5ce 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -636,7 +636,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } try { - Thread.sleep(VmOpWaitInterval.value()); + Thread.sleep(VmOpWaitInterval.value()*1000); } catch (InterruptedException e) { s_logger.info("Waiting for " + vm + " but is interrupted"); throw new ConcurrentOperationException("Waiting for " + vm + " but is interrupted");
