apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second"

Browse Source 
Reverted as per discussion at http://s.apache.org/NOm

This reverts commit 5060f98268090be1c5fdde14055480c5d18a8a6b.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-01-31 18:05:56 +05:30
parent 3cbce11b78
commit 1b922e816c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1415,14 +1415,10 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
String time = configs.get("expunge.interval"); String time = configs.get("expunge.interval");
_expungeInterval = NumbersUtil.parseInt(time, 86400); _expungeInterval = NumbersUtil.parseInt(time, 86400);
if ( _expungeInterval < 600 ) {
_expungeInterval = 600;
}
time = configs.get("expunge.delay"); time = configs.get("expunge.delay");
_expungeDelay = NumbersUtil.parseInt(time, _expungeInterval); _expungeDelay = NumbersUtil.parseInt(time, _expungeInterval);
if ( _expungeDelay < 600 ) {
_expungeDelay = 600;
}
_executor = Executors.newScheduledThreadPool(wrks, new NamedThreadFactory("UserVm-Scavenger")); _executor = Executors.newScheduledThreadPool(wrks, new NamedThreadFactory("UserVm-Scavenger"));
_itMgr.registerGuru(VirtualMachine.Type.User, this); _itMgr.registerGuru(VirtualMachine.Type.User, this);