Skip to content

Commit 76484b5

Browse files
nvazqueznvazquez
committed
CLOUDSTACK-9422: Granular VMware vms creation as full clones on HV
1 parent 3afc4a1 commit 76484b5

File tree

11 files changed

+321
-67
lines changed

11 files changed

+321
-67
lines changed

‎core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public class PrimaryDataStoreTO implements DataStoreTO {
5151
private final String url;
5252
private Map<String, String> details;
5353
private static final String pathSeparator = "/";
54+
private Boolean fullCloneFlag;
5455

5556
public PrimaryDataStoreTO(PrimaryDataStore dataStore) {
5657
this.uuid = dataStore.getUuid();
@@ -144,4 +145,12 @@ public String toString() {
144145
.append("]")
145146
.toString();
146147
}
148+
149+
public Boolean isFullCloneFlag() {
150+
return fullCloneFlag;
151+
}
152+
153+
public void setFullCloneFlag(Boolean fullCloneFlag) {
154+
this.fullCloneFlag = fullCloneFlag;
155+
}
147156
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public interface CapacityManager {
3535
static final String StorageCapacityDisableThresholdCK = "pool.storage.capacity.disablethreshold";
3636
static final String StorageOverprovisioningFactorCK = "storage.overprovisioning.factor";
3737
static final String StorageAllocatedCapacityDisableThresholdCK = "pool.storage.allocated.capacity.disablethreshold";
38+
static final String VmwareCreateCloneFullCK = "vmware.create.full.clone";
3839

3940
static final ConfigKey<Float> CpuOverprovisioningFactor = new ConfigKey<Float>(Float.class, CpuOverprovisioningFactorCK, "Advanced", "1.0",
4041
"Used for CPU overprovisioning calculation; available CPU will be (actualCpuCapacity * cpu.overprovisioning.factor)", true, ConfigKey.Scope.Cluster, null);
@@ -63,6 +64,15 @@ public interface CapacityManager {
6364
true,
6465
ConfigKey.Scope.Cluster,
6566
null);
67+
static final ConfigKey<Boolean> VmwareCreateCloneFull =
68+
new ConfigKey<Boolean>(
69+
"Storage",
70+
Boolean.class,
71+
VmwareCreateCloneFullCK,
72+
"false",
73+
"If set to true, creates VMs as full clones on ESX hypervisor",
74+
true,
75+
ConfigKey.Scope.StoragePool);
6676

6777
public boolean releaseVmCapacity(VirtualMachine vm, boolean moveFromReserved, boolean moveToReservered, Long hostId);
6878

‎engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
import com.cloud.agent.api.to.DiskTO;
7070
import com.cloud.agent.api.to.VirtualMachineTO;
7171
import com.cloud.agent.manager.allocator.PodAllocator;
72+
import com.cloud.capacity.CapacityManager;
7273
import com.cloud.cluster.ClusterManager;
7374
import com.cloud.configuration.Resource.ResourceType;
7475
import com.cloud.dc.DataCenter;
@@ -120,6 +121,7 @@
120121
import com.cloud.utils.fsm.NoTransitionException;
121122
import com.cloud.utils.fsm.StateMachine2;
122123
import com.cloud.vm.DiskProfile;
124+
import com.cloud.vm.UserVmCloneSettingVO;
123125
import com.cloud.vm.UserVmVO;
124126
import com.cloud.vm.VirtualMachine;
125127
import com.cloud.vm.VirtualMachine.State;
@@ -129,9 +131,15 @@
129131
import com.cloud.vm.VmWorkMigrateVolume;
130132
import com.cloud.vm.VmWorkSerializer;
131133
import com.cloud.vm.VmWorkTakeVolumeSnapshot;
134+
import com.cloud.vm.dao.UserVmCloneSettingDao;
132135
import com.cloud.vm.dao.UserVmDao;
133136

134137
public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrationService, Configurable {
138+
139+
public enum UserVmCloneType {
140+
full, linked
141+
}
142+
135143
private static final Logger s_logger = Logger.getLogger(VolumeOrchestrator.class);
136144

137145
@Inject
@@ -178,6 +186,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
178186
ClusterManager clusterManager;
179187
@Inject
180188
StorageManager storageMgr;
189+
@Inject
190+
protected UserVmCloneSettingDao _vmCloneSettingDao;
181191

182192
private final StateMachine2<Volume.State, Volume.Event, Volume> _volStateMachine;
183193
protected List<StoragePoolAllocator> _storagePoolAllocators;
@@ -1353,6 +1363,19 @@ public void prepare(VirtualMachineProfile vm, DeployDestination dest) throws Sto
13531363
disk.setDetails(getDetails(volumeInfo, dataStore));
13541364

13551365
vm.addDisk(disk);
1366+
1367+
// If hypervisor is vSphere, check for clone type setting.
1368+
if (vm.getHypervisorType().equals(HypervisorType.VMware)) {
1369+
// retrieve clone flag.
1370+
UserVmCloneType cloneType = UserVmCloneType.linked;
1371+
Boolean value = CapacityManager.VmwareCreateCloneFull.valueIn(vol.getPoolId());
1372+
if (value != null && value) {
1373+
cloneType = UserVmCloneType.full;
1374+
}
1375+
UserVmCloneSettingVO vmCloneSettingVO = new UserVmCloneSettingVO(vm.getId(), cloneType.toString());
1376+
_vmCloneSettingDao.persist(vmCloneSettingVO);
1377+
}
1378+
13561379
}
13571380
}
13581381

‎engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.apache.cloudstack.storage.RemoteHostEndPoint;
4646
import org.apache.cloudstack.storage.command.CopyCommand;
4747
import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
48+
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
4849
import org.apache.log4j.Logger;
4950
import org.springframework.stereotype.Component;
5051

@@ -56,8 +57,10 @@
5657
import com.cloud.agent.api.to.DataTO;
5758
import com.cloud.agent.api.to.NfsTO;
5859
import com.cloud.agent.api.to.VirtualMachineTO;
60+
import com.cloud.capacity.CapacityManager;
5961
import com.cloud.configuration.Config;
6062
import com.cloud.host.Host;
63+
import com.cloud.hypervisor.Hypervisor;
6164
import com.cloud.storage.DataStoreRole;
6265
import com.cloud.storage.Storage.StoragePoolType;
6366
import com.cloud.storage.StoragePool;
@@ -153,7 +156,7 @@ protected Answer copyObject(DataObject srcData, DataObject destData, Host destHo
153156
srcForCopy = cacheData = cacheMgr.createCacheObject(srcData, destScope);
154157
}
155158

156-
CopyCommand cmd = new CopyCommand(srcForCopy.getTO(), destData.getTO(), _primaryStorageDownloadWait, VirtualMachineManager.ExecuteInSequence.value());
159+
CopyCommand cmd = new CopyCommand(srcForCopy.getTO(), addFullCloneFlagOnVMwareDest(destData.getTO()), _primaryStorageDownloadWait, VirtualMachineManager.ExecuteInSequence.value());
157160
EndPoint ep = destHost != null ? RemoteHostEndPoint.getHypervisorHostEndPoint(destHost) : selector.select(srcForCopy, destData);
158161
if (ep == null) {
159162
String errMsg = "No remote endpoint to send command, check if host or ssvm is down?";
@@ -201,6 +204,23 @@ protected Answer copyObject(DataObject srcData, DataObject destData, Host destHo
201204
}
202205
}
203206

207+
/**
208+
* Adds {@code 'vmware.create.full.clone'} value for a given primary storage, whose HV is VMware, on datastore's {@code fullCloneFlag} field
209+
* @param dataTO Dest data store TO
210+
* @return dataTO including fullCloneFlag, if provided
211+
*/
212+
protected DataTO addFullCloneFlagOnVMwareDest(DataTO dataTO) {
213+
if (dataTO != null && dataTO.getHypervisorType().equals(Hypervisor.HypervisorType.VMware)){
214+
DataStoreTO dataStoreTO = dataTO.getDataStore();
215+
if (dataStoreTO != null && dataStoreTO instanceof PrimaryDataStoreTO){
216+
PrimaryDataStoreTO primaryDataStoreTO = (PrimaryDataStoreTO) dataStoreTO;
217+
Boolean value = CapacityManager.VmwareCreateCloneFull.valueIn(primaryDataStoreTO.getId());
218+
primaryDataStoreTO.setFullCloneFlag(value);
219+
}
220+
}
221+
return dataTO;
222+
}
223+
204224
protected Answer copyObject(DataObject srcData, DataObject destData) {
205225
return copyObject(srcData, destData, null);
206226
}
@@ -257,7 +277,7 @@ protected Answer copyVolumeFromSnapshot(DataObject snapObj, DataObject volObj) {
257277
ep = selector.select(srcData, volObj);
258278
}
259279

260-
CopyCommand cmd = new CopyCommand(srcData.getTO(), volObj.getTO(), _createVolumeFromSnapshotWait, VirtualMachineManager.ExecuteInSequence.value());
280+
CopyCommand cmd = new CopyCommand(srcData.getTO(), addFullCloneFlagOnVMwareDest(volObj.getTO()), _createVolumeFromSnapshotWait, VirtualMachineManager.ExecuteInSequence.value());
261281
Answer answer = null;
262282
if (ep == null) {
263283
String errMsg = "No remote endpoint to send command, check if host or ssvm is down?";
@@ -280,7 +300,7 @@ protected Answer copyVolumeFromSnapshot(DataObject snapObj, DataObject volObj) {
280300
}
281301

282302
protected Answer cloneVolume(DataObject template, DataObject volume) {
283-
CopyCommand cmd = new CopyCommand(template.getTO(), volume.getTO(), 0, VirtualMachineManager.ExecuteInSequence.value());
303+
CopyCommand cmd = new CopyCommand(template.getTO(), addFullCloneFlagOnVMwareDest(volume.getTO()), 0, VirtualMachineManager.ExecuteInSequence.value());
284304
try {
285305
EndPoint ep = selector.select(volume.getDataStore());
286306
Answer answer = null;
@@ -330,7 +350,7 @@ protected Answer copyVolumeBetweenPools(DataObject srcData, DataObject destData)
330350

331351
objOnImageStore.processEvent(Event.CopyingRequested);
332352

333-
CopyCommand cmd = new CopyCommand(objOnImageStore.getTO(), destData.getTO(), _copyvolumewait, VirtualMachineManager.ExecuteInSequence.value());
353+
CopyCommand cmd = new CopyCommand(objOnImageStore.getTO(), addFullCloneFlagOnVMwareDest(destData.getTO()), _copyvolumewait, VirtualMachineManager.ExecuteInSequence.value());
334354
EndPoint ep = selector.select(objOnImageStore, destData);
335355
if (ep == null) {
336356
String errMsg = "No remote endpoint to send command, check if host or ssvm is down?";
@@ -477,7 +497,7 @@ protected Answer createTemplateFromSnapshot(DataObject srcData, DataObject destD
477497
ep = selector.select(srcData, destData);
478498
}
479499

480-
CopyCommand cmd = new CopyCommand(srcData.getTO(), destData.getTO(), _createprivatetemplatefromsnapshotwait, VirtualMachineManager.ExecuteInSequence.value());
500+
CopyCommand cmd = new CopyCommand(srcData.getTO(), addFullCloneFlagOnVMwareDest(destData.getTO()), _createprivatetemplatefromsnapshotwait, VirtualMachineManager.ExecuteInSequence.value());
481501
Answer answer = null;
482502
if (ep == null) {
483503
String errMsg = "No remote endpoint to send command, check if host or ssvm is down?";
@@ -513,7 +533,7 @@ protected Answer copySnapshot(DataObject srcData, DataObject destData) {
513533
Scope selectedScope = pickCacheScopeForCopy(srcData, destData);
514534
cacheData = cacheMgr.getCacheObject(srcData, selectedScope);
515535

516-
CopyCommand cmd = new CopyCommand(srcData.getTO(), destData.getTO(), _backupsnapshotwait, VirtualMachineManager.ExecuteInSequence.value());
536+
CopyCommand cmd = new CopyCommand(srcData.getTO(), addFullCloneFlagOnVMwareDest(destData.getTO()), _backupsnapshotwait, VirtualMachineManager.ExecuteInSequence.value());
517537
cmd.setCacheTO(cacheData.getTO());
518538
cmd.setOptions(options);
519539
EndPoint ep = selector.select(srcData, destData);
@@ -525,6 +545,7 @@ protected Answer copySnapshot(DataObject srcData, DataObject destData) {
525545
answer = ep.sendMessage(cmd);
526546
}
527547
} else {
548+
addFullCloneFlagOnVMwareDest(destData.getTO());
528549
CopyCommand cmd = new CopyCommand(srcData.getTO(), destData.getTO(), _backupsnapshotwait, VirtualMachineManager.ExecuteInSequence.value());
529550
cmd.setOptions(options);
530551
EndPoint ep = selector.select(srcData, destData, StorageAction.BACKUPSNAPSHOT);

‎engine/storage/datamotion/test/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.apache.cloudstack.storage.motion;
20+
21+
import static org.mockito.Mockito.when;
22+
23+
import java.lang.reflect.Field;
24+
import java.lang.reflect.Modifier;
25+
26+
import static org.mockito.Mockito.verify;
27+
import static org.mockito.Mockito.never;
28+
import static org.mockito.Mockito.any;
29+
30+
import org.apache.cloudstack.framework.config.ConfigKey;
31+
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
32+
import org.junit.Before;
33+
import org.junit.Test;
34+
import org.junit.runner.RunWith;
35+
import org.mockito.InjectMocks;
36+
import org.mockito.Mock;
37+
import org.mockito.MockitoAnnotations;
38+
import org.mockito.Spy;
39+
import org.powermock.core.classloader.annotations.PrepareForTest;
40+
import org.powermock.modules.junit4.PowerMockRunner;
41+
42+
import com.cloud.agent.api.to.DataTO;
43+
import com.cloud.capacity.CapacityManager;
44+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
45+
46+
@RunWith(PowerMockRunner.class)
47+
@PrepareForTest(CapacityManager.class)
48+
public class AncientDataMotionStrategyTest {
49+
50+
@Spy
51+
@InjectMocks
52+
private AncientDataMotionStrategy strategy = new AncientDataMotionStrategy();
53+
54+
@Mock
55+
DataTO dataTO;
56+
@Mock
57+
PrimaryDataStoreTO dataStoreTO;
58+
@Mock
59+
ConfigKey<Boolean> vmwareKey;
60+
61+
private static final long POOL_ID = 1l;
62+
private static final Boolean FULL_CLONE_FLAG = true;
63+
64+
@Before
65+
public void setup() throws Exception {
66+
MockitoAnnotations.initMocks(this);
67+
68+
replaceVmwareCreateCloneFullField();
69+
70+
when(vmwareKey.valueIn(POOL_ID)).thenReturn(FULL_CLONE_FLAG);
71+
72+
when(dataTO.getHypervisorType()).thenReturn(HypervisorType.VMware);
73+
when(dataTO.getDataStore()).thenReturn(dataStoreTO);
74+
when(dataStoreTO.getId()).thenReturn(POOL_ID);
75+
}
76+
77+
private void replaceVmwareCreateCloneFullField() throws Exception {
78+
Field field = CapacityManager.class.getDeclaredField("VmwareCreateCloneFull");
79+
field.setAccessible(true);
80+
// remove final modifier from field
81+
Field modifiersField = Field.class.getDeclaredField("modifiers");
82+
modifiersField.setAccessible(true);
83+
modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
84+
field.set(null, vmwareKey);
85+
}
86+
87+
@Test
88+
public void testAddFullCloneFlagOnVMwareDest(){
89+
strategy.addFullCloneFlagOnVMwareDest(dataTO);
90+
verify(dataStoreTO).setFullCloneFlag(FULL_CLONE_FLAG);
91+
}
92+
93+
@Test
94+
public void testAddFullCloneFlagOnNotVmwareDest(){
95+
when(dataTO.getHypervisorType()).thenReturn(HypervisorType.Any);
96+
verify(dataStoreTO, never()).setFullCloneFlag(any(Boolean.class));
97+
}
98+
99+
}

0 commit comments

Comments
 (0)