From 790f82be049befbf0ba00db72156e5a817e0cc68 Mon Sep 17 00:00:00 2001
From: Anthony Xu <anthony@cloud.com>
Date: Mon, 13 Aug 2012 17:39:21 -0700
Subject: [PATCH] CS-15922 : to avoid race condition when expunge vm, expunge
 interval and expunge deplay should be larger than 600 second

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

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index a9474baea5b..6f6a754021c 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);