apache#4534 extract some codes to methods

Author: ustcweizhou

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -3230,12 +3230,12 @@ public boolean checkIfVmHasClusterWideVolumes(Long vmId) {
     public DataCenterDeployment getMigrationDeployment(final Long vmId, final Host host, final Long poolId, final ExcludeList excludes) {
         if (MIGRATE_VM_ACROSS_CLUSTERS.valueIn(host.getDataCenterId()) && !checkIfVmHasClusterWideVolumes(vmId)) {
             s_logger.info("Searching for hosts in the zone for vm migration");
-            List<Long> clustersToExcluded = _clusterDao.listAllClusters(host.getDataCenterId());
+            List<Long> clustersToExclude = _clusterDao.listAllClusters(host.getDataCenterId());
             List<ClusterVO> clusterList = _clusterDao.listByDcHyType(host.getDataCenterId(), host.getHypervisorType().toString());
             for (ClusterVO cluster : clusterList) {
-                clustersToExcluded.remove(cluster.getId());
+                clustersToExclude.remove(cluster.getId());
             }
-            for (Long clusterId : clustersToExcluded) {
+            for (Long clusterId : clustersToExclude) {
                 excludes.addCluster(clusterId);
             }
             return new DataCenterDeployment(host.getDataCenterId(), null, null, null, poolId, null);

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

@@ -1266,22 +1266,7 @@ private boolean doMaintain(final long hostId) {
             List<HostVO> hosts = listAllUpAndEnabledHosts(Host.Type.Routing, host.getClusterId(), host.getPodId(), host.getDataCenterId());
             if (hosts == null || hosts.isEmpty()) {
                 s_logger.warn("Unable to find a host for vm migration in cluster: " + host.getClusterId());
-                if (MIGRATE_VM_ACROSS_CLUSTERS.valueIn(host.getDataCenterId())) {
-                    s_logger.info("Looking for hosts across different clusters in zone: " + host.getDataCenterId());
-                    hosts = listAllUpAndEnabledHosts(Host.Type.Routing, null, null, host.getDataCenterId());
-                    if (hosts == null || hosts.isEmpty()) {
-                        s_logger.warn("Unable to find a host for vm migration in zone: " + host.getDataCenterId());
-                        return false;
-                    }
-                    // Dont migrate vm if it has volumes on cluster-wide pool
-                    for (final VMInstanceVO vm : vms) {
-                        if (_vmMgr.checkIfVmHasClusterWideVolumes(vm.getId())) {
-                            s_logger.warn("Unable to migrate vm " + vm.getInstanceName() + " as it has volumes on cluster-wide pool");
-                            return false;
-                        }
-                    }
-                } else {
-                    s_logger.warn("Not migrating VM across cluster since " + MIGRATE_VM_ACROSS_CLUSTERS.key() + " is false");
+                if (! isClusterWideMigrationSupported(host, vms, hosts)) {
                     return false;
                 }
             }
@@ -1305,6 +1290,28 @@ private boolean doMaintain(final long hostId) {
         return true;
     }
 
+    private boolean isClusterWideMigrationSupported(Host host, List<VMInstanceVO> vms, List<HostVO> hosts) {
+        if (MIGRATE_VM_ACROSS_CLUSTERS.valueIn(host.getDataCenterId())) {
+            s_logger.info("Looking for hosts across different clusters in zone: " + host.getDataCenterId());
+            hosts = listAllUpAndEnabledHosts(Host.Type.Routing, null, null, host.getDataCenterId());
+            if (hosts == null || hosts.isEmpty()) {
+                s_logger.warn("Unable to find a host for vm migration in zone: " + host.getDataCenterId());
+                return false;
+            }
+            // Dont migrate vm if it has volumes on cluster-wide pool
+            for (final VMInstanceVO vm : vms) {
+                if (_vmMgr.checkIfVmHasClusterWideVolumes(vm.getId())) {
+                    s_logger.warn("Unable to migrate vm " + vm.getInstanceName() + " as it has volumes on cluster-wide pool");
+                    return false;
+                }
+            }
+        } else {
+            s_logger.warn("Not migrating VM across cluster since " + MIGRATE_VM_ACROSS_CLUSTERS.key() + " is false");
+            return false;
+        }
+        return true;
+   }
+
     @Override
     public boolean maintain(final long hostId) throws AgentUnavailableException {
         final Boolean result = propagateResourceEvent(hostId, ResourceState.Event.AdminAskMaintenance);

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -5792,21 +5792,7 @@ public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) thr
 
         DeployDestination dest = null;
         if (destinationHost == null) {
-            vm.setLastHostId(null); // Last host does not have higher priority in vm migration
-            final ServiceOfferingVO offering = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
-            final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, offering, null, null);
-            final Host host = _hostDao.findById(srcHostId);
-            ExcludeList excludes = new ExcludeList();
-            excludes.addHost(srcHostId);
-            final DataCenterDeployment plan = _itMgr.getMigrationDeployment(vm.getId(), host, null, excludes);
-            try {
-                dest = _planningMgr.planDeployment(profile, plan, excludes, null);
-            } catch (final AffinityConflictException e2) {
-                s_logger.warn("Unable to create deployment, affinity rules associted to the VM conflict", e2);
-                throw new CloudRuntimeException("Unable to create deployment, affinity rules associted to the VM conflict");
-            } catch (final InsufficientServerCapacityException e3) {
-                throw new CloudRuntimeException("Unable to find a server to migrate the vm to");
-            }
+            dest = findVmMigrationDestination(vm, srcHostId);
         } else {
             dest = checkVmMigrationDestination(vm, srcHostId, destinationHost);
         }
@@ -5830,6 +5816,27 @@ public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) thr
         }
     }
 
+    private DeployDestination findVmMigrationDestination(VMInstanceVO vm, Long srcHostId) {
+        DeployDestination dest = null;
+        vm.setLastHostId(null); // Last host does not have higher priority in vm migration
+        final ServiceOfferingVO offering = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
+        final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, offering, null, null);
+        final Host host = _hostDao.findById(srcHostId);
+        ExcludeList excludes = new ExcludeList();
+        excludes.addHost(srcHostId);
+        final DataCenterDeployment plan = _itMgr.getMigrationDeployment(vm.getId(), host, null, excludes);
+        try {
+            dest = _planningMgr.planDeployment(profile, plan, excludes, null);
+        } catch (final AffinityConflictException e2) {
+            s_logger.warn("Unable to create deployment, affinity rules associted to the VM conflict", e2);
+            throw new CloudRuntimeException("Unable to create deployment, affinity rules associted to the VM conflict");
+        } catch (final InsufficientServerCapacityException e3) {
+            throw new CloudRuntimeException("Unable to find a server to migrate the vm to");
+        }
+        return dest;
+    }
+
+
     private DeployDestination checkVmMigrationDestination(VMInstanceVO vm, Long srcHostId, Host destinationHost) throws VirtualMachineMigrationException {
         if (destinationHost == null) {
             return null;