Updated Branches: refs/heads/vmsync b4c6a594e -> d71e358a9
Removed some of the unused code. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38a30574 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38a30574 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38a30574 Branch: refs/heads/vmsync Commit: 38a30574e912a8e270a0b6c222548d73157b72d9 Parents: b4c6a59 Author: Alex Huang <[email protected]> Authored: Tue Jun 11 09:51:51 2013 -0700 Committer: Alex Huang <[email protected]> Committed: Tue Jun 11 09:51:51 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 15 +-------------- server/src/com/cloud/vm/VmWorkJobDispatcher.java | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38a30574/server/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 56f066a..409fd62 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -678,8 +678,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac protected Ternary<VMInstanceVO, ReservationContext, VmWorkJobVO> changeToStartState(VirtualMachineGuru vmGuru, VMInstanceVO vm, User caller, Account account) throws ConcurrentOperationException { - long vmId = vm.getId(); - Ternary<VMInstanceVO, ReservationContext, VmWorkJobVO> result = null; Transaction txn = Transaction.currentTxn(); txn.start(); @@ -1251,7 +1249,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } } - public void processVmStopWork(String vmUuid, boolean forced) throws AgentUnavailableException, + public void orchestrateStop(String vmUuid, boolean forced) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException { CallContext context = CallContext.current(); User user = context.getCallingUser(); @@ -1644,8 +1642,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac public VirtualMachine storageMigration(String vmUuid, StoragePool destPool) { VMInstanceVO vm = _vmDao.findByUuid(vmUuid); - long vmId = vm.getId(); - try { stateTransitTo(vm, VirtualMachine.Event.StorageMigrationRequested, null); } catch (NoTransitionException e) { @@ -1969,8 +1965,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac DeployDestination destination = new DeployDestination(dc, pod, cluster, destHost); // Create a map of which volume should go in which storage pool. - long vmId = vm.getId(); - VMInstanceVO vm2 = _vmDao.findById(vmId); VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); volumeToPool = getPoolListForVolumesForMigration(profile, destHost, volumeToPool); @@ -2101,7 +2095,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public boolean migrateAway(VirtualMachine.Type vmType, long vmId, long srcHostId) throws InsufficientServerCapacityException, VirtualMachineMigrationException { - VirtualMachineGuru vmGuru = _vmGurus.get(vmType); VMInstanceVO vm = _vmDao.findById(vmId); if (vm == null) { s_logger.debug("Unable to find a VM for " + vmId); @@ -3026,7 +3019,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac public VMInstanceVO vm; public VirtualMachineGuru guru; - @SuppressWarnings("unchecked") public AgentVmInfo(String name, VirtualMachineGuru guru, VMInstanceVO vm, State state, String host) { this.name = name; this.state = state; @@ -3221,9 +3213,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac //3) Convert nicProfile to NicTO NicTO nicTO = toNicTO(nic, vmProfile.getVirtualMachine().getHypervisorType()); - //4) plug the nic to the vm - VirtualMachineGuru vmGuru = getVmGuru(vmVO); - s_logger.debug("Plugging nic for vm " + vm + " in network " + network); boolean result = false; @@ -3277,7 +3266,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac DataCenter dc = _configMgr.getZone(network.getDataCenterId()); Host host = _hostDao.findById(vm.getHostId()); DeployDestination dest = new DeployDestination(dc, null, null, host); - VirtualMachineGuru vmGuru = getVmGuru(vmVO); HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vmProfile.getVirtualMachine().getHypervisorType()); VirtualMachineTO vmTO = hvGuru.implement(vmProfile); @@ -3341,7 +3329,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac DataCenter dc = _configMgr.getZone(network.getDataCenterId()); Host host = _hostDao.findById(vm.getHostId()); DeployDestination dest = new DeployDestination(dc, null, null, host); - VirtualMachineGuru vmGuru = getVmGuru(vmVO); HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vmProfile.getVirtualMachine().getHypervisorType()); VirtualMachineTO vmTO = hvGuru.implement(vmProfile); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38a30574/server/src/com/cloud/vm/VmWorkJobDispatcher.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/VmWorkJobDispatcher.java b/server/src/com/cloud/vm/VmWorkJobDispatcher.java index 8b04e91..3e6dc0b 100644 --- a/server/src/com/cloud/vm/VmWorkJobDispatcher.java +++ b/server/src/com/cloud/vm/VmWorkJobDispatcher.java @@ -72,7 +72,7 @@ public class VmWorkJobDispatcher extends AdapterBase implements AsyncJobDispatch _vmMgr.orchestrateStart(vm.getUuid(), start.getParams(), start.getPlan()); } else if (cmd.equals(Stop)) { VmWorkStop stop = (VmWorkStop)work; - _vmMgr.processVmStopWork(vm.getUuid(), stop.isForceStop()); + _vmMgr.orchestrateStop(vm.getUuid(), stop.isForceStop()); } _asyncJobMgr.completeAsyncJob(job.getId(), AsyncJobConstants.STATUS_SUCCEEDED, 0, null); } catch(Throwable e) {
