incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: refs/heads/master - Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second"
Date Thu, 31 Jan 2013 12:45:53 GMT
Updated Branches:
  refs/heads/master 3cbce11b7 -> 1b922e816


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 <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1b922e81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1b922e81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1b922e81

Branch: refs/heads/master
Commit: 1b922e816cdfd4ae5ea19a1c6efdcf0b2400e5a1
Parents: 3cbce11
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Thu Jan 31 18:05:56 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Jan 31 18:15:41 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmManagerImpl.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1b922e81/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 ff6f3e7..3737450 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);


Mime
View raw message