Updated Branches: refs/heads/master cbcd5cace -> 5060f9826
CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5060f982 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5060f982 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5060f982 Branch: refs/heads/master Commit: 5060f98268090be1c5fdde14055480c5d18a8a6b Parents: cbcd5ca Author: Anthony Xu <[email protected]> Authored: Mon Aug 13 17:39:21 2012 -0700 Committer: anthony <[email protected]> Committed: Mon Aug 13 17:45:38 2012 -0700 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5060f982/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index a9474ba..6f6a754 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -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);
