etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Anthony Xu 2012-08-13 17:39:21 -07:00 committed by Alex Huang
parent 5bfc43bd50
commit 790f82be04
1 changed files with 6 additions and 2 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

@ -1137,10 +1137,14 @@ 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);