From 1b922e816cdfd4ae5ea19a1c6efdcf0b2400e5a1 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Thu, 31 Jan 2013 18:05:56 +0530 Subject: [PATCH] Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second" Reverted as per discussion at http://s.apache.org/NOm This reverts commit 5060f98268090be1c5fdde14055480c5d18a8a6b. Signed-off-by: Prasanna Santhanam --- server/src/com/cloud/vm/UserVmManagerImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index ff6f3e7686c..3737450674d 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1415,14 +1415,10 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager String time = configs.get("expunge.interval"); _expungeInterval = NumbersUtil.parseInt(time, 86400); - if ( _expungeInterval < 600 ) { - _expungeInterval = 600; - } + time = configs.get("expunge.delay"); _expungeDelay = NumbersUtil.parseInt(time, _expungeInterval); - if ( _expungeDelay < 600 ) { - _expungeDelay = 600; - } + _executor = Executors.newScheduledThreadPool(wrks, new NamedThreadFactory("UserVm-Scavenger")); _itMgr.registerGuru(VirtualMachine.Type.User, this);