add global setting to allow parallel execution on vmware

Author: DaanHoogland

api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java

@@ -37,6 +37,7 @@
 public interface HypervisorGuru extends Adapter {
     ConfigKey<Boolean> VmwareFullClone = new ConfigKey<Boolean>("Advanced", Boolean.class, "vmware.create.full.clone", "true",
             "If set to true, creates guest VMs as full clones on ESX", false);
+
     HypervisorType getHypervisorType();
 
     /**

engine/components-api/src/main/java/com/cloud/capacity/CapacityManager.java

@@ -92,6 +92,9 @@ public interface CapacityManager {
     static final ConfigKey<Float> SecondaryStorageCapacityThreshold = new ConfigKey<Float>("Advanced", Float.class, "secondary.storage.capacity.threshold", "0.90",
             "Percentage (as a value between 0 and 1) of secondary storage capacity threshold.", true);
 
+    public static final ConfigKey<Boolean> vmwareAllowParallelExecution = new ConfigKey<Boolean>("Advanced", Boolean.class, "vmware.allow.parallel.copy.command.execution", "false",
+            "allow copy command to be executed in parallel in spite of 'vmware.create.full.clone' being set to false.", true, ConfigKey.Scope.Global);
+
     public boolean releaseVmCapacity(VirtualMachine vm, boolean moveFromReserved, boolean moveToReservered, Long hostId);
 
     void allocateVmCapacity(VirtualMachine vm, boolean fromLastHost);

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

@@ -1557,8 +1557,9 @@ public boolean getExecuteInSequence(final HypervisorType hypervisorType) {
             case LXC:
                 return false;
             case VMware:
-                final Boolean fullClone = HypervisorGuru.VmwareFullClone.value();
-                return fullClone;
+                final Boolean fullClone = getFullCloneConfiguration();
+                final Boolean allowParallel = getAllowParallelExecutionConfiguration();
+                return fullClone && !allowParallel;
             default:
                 return ExecuteInSequence.value();
         }
@@ -1645,6 +1646,16 @@ private void unmanageVMNics(VirtualMachineProfile profile, VMInstanceVO vm) {
         _networkMgr.unmanageNics(profile);
     }
 
+    Boolean getAllowParallelExecutionConfiguration() {
+        final Boolean allowParallel = CapacityManager.vmwareAllowParallelExecution.value();
+        return allowParallel;
+    }
+
+    Boolean getFullCloneConfiguration() {
+        final Boolean fullClone = CapacityManager.VmwareCreateCloneFull.value();
+        return fullClone;
+    }
+
     private List<Map<String, String>> getVolumesToDisconnect(VirtualMachine vm) {
         List<Map<String, String>> volumesToDisconnect = new ArrayList<>();
 

engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java

@@ -56,7 +56,6 @@
 import com.cloud.deploy.DeploymentPlanner.ExcludeList;
 import com.cloud.host.HostVO;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.hypervisor.HypervisorGuru;
 import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.DiskOfferingVO;
@@ -209,9 +208,23 @@ public void testSendStopWithNullAnswer() throws Exception {
     public void testExeceuteInSequence() {
         assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.XenServer) == false);
         assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.KVM) == false);
-        assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.VMware) == HypervisorGuru.VmwareFullClone.value());
         assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.Ovm3) == VirtualMachineManager.ExecuteInSequence.value());
     }
+    @Test
+    public void testExeceuteInSequenceVmware() {
+        when(virtualMachineManagerImpl.getFullCloneConfiguration()).thenReturn(Boolean.FALSE);
+        when(virtualMachineManagerImpl.getAllowParallelExecutionConfiguration()).thenReturn(Boolean.FALSE);
+        assertFalse("no full clones so no need to execute in sequence", virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.VMware));
+        when(virtualMachineManagerImpl.getFullCloneConfiguration()).thenReturn(Boolean.TRUE);
+        when(virtualMachineManagerImpl.getAllowParallelExecutionConfiguration()).thenReturn(Boolean.FALSE);
+        assertTrue("full clones and no explicit parallel execution allowed, should execute in sequence", virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.VMware));
+        when(virtualMachineManagerImpl.getFullCloneConfiguration()).thenReturn(Boolean.TRUE);
+        when(virtualMachineManagerImpl.getAllowParallelExecutionConfiguration()).thenReturn(Boolean.TRUE);
+        assertFalse("execute in sequence should not be needed as parallel is allowed", virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.VMware));
+        when(virtualMachineManagerImpl.getFullCloneConfiguration()).thenReturn(Boolean.FALSE);
+        when(virtualMachineManagerImpl.getAllowParallelExecutionConfiguration()).thenReturn(Boolean.TRUE);
+        assertFalse("double reasons to allow parallel execution", virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.VMware));
+    }
 
     @Test
     public void testCheckIfCanUpgrade() throws Exception {

server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java

@@ -1256,6 +1256,6 @@ public String getConfigComponentName() {
     @Override
     public ConfigKey<?>[] getConfigKeys() {
         return new ConfigKey<?>[] {CpuOverprovisioningFactor, MemOverprovisioningFactor, StorageCapacityDisableThreshold, StorageOverprovisioningFactor,
-            StorageAllocatedCapacityDisableThreshold, StorageOperationsExcludeCluster, VmwareCreateCloneFull, ImageStoreNFSVersion, SecondaryStorageCapacityThreshold};
+            StorageAllocatedCapacityDisableThreshold, StorageOperationsExcludeCluster, VmwareCreateCloneFull, ImageStoreNFSVersion, SecondaryStorageCapacityThreshold, vmwareAllowParallelExecution};
     }
 }