You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/08/15 23:14:09 UTC

[19/20] git commit: CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second

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/790f82be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/790f82be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/790f82be

Branch: refs/heads/4.0
Commit: 790f82be049befbf0ba00db72156e5a817e0cc68
Parents: 5bfc43b
Author: Anthony Xu <an...@cloud.com>
Authored: Mon Aug 13 17:39:21 2012 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Wed Aug 15 14:01: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/790f82be/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);