You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/05/27 21:33:49 UTC

[2/4] git commit: updated refs/heads/4.0 to a572399

remove duplicated ExpungeTask from BareMetalVmManagerImpl


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

Branch: refs/heads/4.0
Commit: 98a9edfaaf5e944af24c8dc3b240dbd25109564d
Parents: cf47a72
Author: Wei Zhou <w....@leaseweb.com>
Authored: Mon May 27 21:29:43 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Mon May 27 21:29:43 2013 +0200

----------------------------------------------------------------------
 .../cloud/baremetal/BareMetalVmManagerImpl.java    |   28 ++++++--------
 1 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98a9edfa/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
index 3972728..0797711 100755
--- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
+++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Executors;
 
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
@@ -77,13 +76,11 @@ import com.cloud.user.SSHKeyPair;
 import com.cloud.user.User;
 import com.cloud.user.UserContext;
 import com.cloud.uservm.UserVm;
-import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.Adapters;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.utils.component.Inject;
 import com.cloud.utils.component.Manager;
-import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.StateListener;
@@ -448,25 +445,24 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet
 			_instance = "DEFAULT";
 		}
 
-		String workers = configs.get("expunge.workers");
-		int wrks = NumbersUtil.parseInt(workers, 10);
-
-		String time = configs.get("expunge.interval");
-		_expungeInterval = NumbersUtil.parseInt(time, 86400);
-
-		time = configs.get("expunge.delay");
-		_expungeDelay = NumbersUtil.parseInt(time, _expungeInterval);
-
-		_executor = Executors.newScheduledThreadPool(wrks, new NamedThreadFactory("UserVm-Scavenger"));
-
 		_itMgr.registerGuru(Type.UserBareMetal, this);
 		VirtualMachine.State.getStateMachine().registerListener(this);
 
-		s_logger.info("User VM Manager is configured.");
+		s_logger.info("Bare Metal VM Manager is configured.");
 
 		return true;
 	}
-	
+
+    @Override
+    public boolean start() {
+        return true;
+    }
+
+    @Override
+    public boolean stop() {
+        return true;
+    }
+
 	@Override
 	public boolean finalizeVirtualMachineProfile(VirtualMachineProfile<UserVmVO> profile, DeployDestination dest, ReservationContext context) {
         UserVmVO vm = profile.getVirtualMachine();