Skip to content

Commit 5ef41e1

Browse files
abh1sarabh1sar
committed
Merge remote-tracking branch 'upstream/4.19' into changescope419
2 parents 8d36db0 + f7b95cd commit 5ef41e1

19 files changed

Lines changed: 513 additions & 304 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
smoke/test_deploy_vm_with_userdata
5555
smoke/test_deploy_vms_in_parallel
5656
smoke/test_deploy_vms_with_varied_deploymentplanners
57+
smoke/test_restore_vm
5758
smoke/test_diagnostics
5859
smoke/test_direct_download
5960
smoke/test_disk_offerings

‎engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public interface VolumeOrchestrationService {
8585
VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId, Long destPoolClusterId, HypervisorType dataDiskHyperType)
8686
throws ConcurrentOperationException, StorageUnavailableException;
8787

88-
Volume allocateDuplicateVolume(Volume oldVol, Long templateId);
88+
Volume allocateDuplicateVolume(Volume oldVol, DiskOffering diskOffering, Long templateId);
8989

9090
boolean volumeOnSharedStoragePool(Volume volume);
9191

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,11 @@ public VolumeInfo moveVolume(VolumeInfo volumeInfo, long destPoolDcId, Long dest
305305
}
306306

307307
@Override
308-
public Volume allocateDuplicateVolume(Volume oldVol, Long templateId) {
309-
return allocateDuplicateVolumeVO(oldVol, templateId);
308+
public Volume allocateDuplicateVolume(Volume oldVol, DiskOffering diskOffering, Long templateId) {
309+
return allocateDuplicateVolumeVO(oldVol, diskOffering, templateId);
310310
}
311311

312-
public VolumeVO allocateDuplicateVolumeVO(Volume oldVol, Long templateId) {
312+
public VolumeVO allocateDuplicateVolumeVO(Volume oldVol, DiskOffering diskOffering, Long templateId) {
313313
VolumeVO newVol = new VolumeVO(oldVol.getVolumeType(), oldVol.getName(), oldVol.getDataCenterId(), oldVol.getDomainId(), oldVol.getAccountId(), oldVol.getDiskOfferingId(),
314314
oldVol.getProvisioningType(), oldVol.getSize(), oldVol.getMinIops(), oldVol.getMaxIops(), oldVol.get_iScsiName());
315315
if (templateId != null) {
@@ -321,8 +321,7 @@ public VolumeVO allocateDuplicateVolumeVO(Volume oldVol, Long templateId) {
321321
newVol.setInstanceId(oldVol.getInstanceId());
322322
newVol.setRecreatable(oldVol.isRecreatable());
323323
newVol.setFormat(oldVol.getFormat());
324-
325-
if (oldVol.getPassphraseId() != null) {
324+
if ((diskOffering == null || diskOffering.getEncrypt()) && oldVol.getPassphraseId() != null) {
326325
PassphraseVO passphrase = passphraseDao.persist(new PassphraseVO(true));
327326
newVol.setPassphraseId(passphrase.getId());
328327
}
@@ -1180,7 +1179,7 @@ protected VolumeVO switchVolume(final VolumeVO existingVolume, final VirtualMach
11801179
return Transaction.execute(new TransactionCallback<VolumeVO>() {
11811180
@Override
11821181
public VolumeVO doInTransaction(TransactionStatus status) {
1183-
VolumeVO newVolume = allocateDuplicateVolumeVO(existingVolume, templateIdToUseFinal);
1182+
VolumeVO newVolume = allocateDuplicateVolumeVO(existingVolume, null, templateIdToUseFinal);
11841183
try {
11851184
stateTransitTo(existingVolume, Volume.Event.DestroyRequested);
11861185
} catch (NoTransitionException e) {

‎engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -482,19 +482,19 @@ private VMTemplateZoneVO createOrUpdateTemplateZoneEntry(long zoneId, long templ
482482
templateZoneVO = vmTemplateZoneDao.persist(templateZoneVO);
483483
} else {
484484
templateZoneVO.setLastUpdated(new java.util.Date());
485-
if (vmTemplateZoneDao.update(templateZoneVO.getId(), templateZoneVO)) {
485+
if (!vmTemplateZoneDao.update(templateZoneVO.getId(), templateZoneVO)) {
486486
templateZoneVO = null;
487487
}
488488
}
489489
return templateZoneVO;
490490
}
491491

492-
private void createCrossZonesTemplateZoneRefEntries(VMTemplateVO template) {
492+
private void createCrossZonesTemplateZoneRefEntries(Long templateId) {
493493
List<DataCenterVO> dcs = dataCenterDao.listAll();
494494
for (DataCenterVO dc : dcs) {
495-
VMTemplateZoneVO templateZoneVO = createOrUpdateTemplateZoneEntry(dc.getId(), template.getId());
495+
VMTemplateZoneVO templateZoneVO = createOrUpdateTemplateZoneEntry(dc.getId(), templateId);
496496
if (templateZoneVO == null) {
497-
throw new CloudRuntimeException(String.format("Failed to create template_zone_ref record for the systemVM template for hypervisor: %s and zone: %s", template.getHypervisorType().name(), dc));
497+
throw new CloudRuntimeException(String.format("Failed to create template_zone_ref record for the systemVM template (id: %s) and zone: %s", templateId, dc));
498498
}
499499
}
500500
}
@@ -624,8 +624,9 @@ private Long performTemplateRegistrationOperations(Pair<Hypervisor.HypervisorTyp
624624
throw new CloudRuntimeException(String.format("Failed to register template for hypervisor: %s", hypervisor.name()));
625625
}
626626
templateId = template.getId();
627-
createCrossZonesTemplateZoneRefEntries(template);
628627
}
628+
createCrossZonesTemplateZoneRefEntries(templateId);
629+
629630
details.setId(templateId);
630631
String destTempFolderName = String.valueOf(templateId);
631632
String destTempFolder = filePath + PARTIAL_TEMPLATE_FOLDER + destTempFolderName;

‎engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ private void destroyAndReallocateManagedVolume(VolumeInfo volumeInfo) {
12361236

12371237
volumeInfo.processEvent(Event.DestroyRequested);
12381238

1239-
Volume newVol = _volumeMgr.allocateDuplicateVolume(volume, null);
1239+
Volume newVol = _volumeMgr.allocateDuplicateVolume(volume, null, null);
12401240
VolumeVO newVolume = (VolumeVO) newVol;
12411241
newVolume.set_iScsiName(null);
12421242
volDao.update(newVolume.getId(), newVolume);

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -972,6 +972,10 @@ public String getDiskLabel() {
972972
return _diskLabel;
973973
}
974974

975+
public void setDiskLabel(String label) {
976+
_diskLabel = label;
977+
}
978+
975979
public DiskType getDiskType() {
976980
return _diskType;
977981
}

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/MigrateKVMAsync.java‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,20 @@
1818
*/
1919
package com.cloud.hypervisor.kvm.resource;
2020

21+
import java.util.Iterator;
22+
import java.util.Set;
2123
import java.util.concurrent.Callable;
2224

25+
import org.apache.log4j.Logger;
2326
import org.libvirt.Connect;
2427
import org.libvirt.Domain;
2528
import org.libvirt.LibvirtException;
29+
import org.libvirt.TypedParameter;
30+
import org.libvirt.TypedStringParameter;
31+
import org.libvirt.TypedUlongParameter;
2632

2733
public class MigrateKVMAsync implements Callable<Domain> {
34+
protected Logger logger = Logger.getLogger(getClass());
2835

2936
private final LibvirtComputingResource libvirtComputingResource;
3037

@@ -37,6 +44,8 @@ public class MigrateKVMAsync implements Callable<Domain> {
3744
private boolean migrateNonSharedInc;
3845
private boolean autoConvergence;
3946

47+
protected Set<String> migrateDiskLabels;
48+
4049
// Libvirt Migrate Flags reference:
4150
// https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateFlags
4251

@@ -87,7 +96,7 @@ public class MigrateKVMAsync implements Callable<Domain> {
8796
private static final int LIBVIRT_VERSION_SUPPORTS_AUTO_CONVERGE = 1002003;
8897

8998
public MigrateKVMAsync(final LibvirtComputingResource libvirtComputingResource, final Domain dm, final Connect dconn, final String dxml,
90-
final boolean migrateStorage, final boolean migrateNonSharedInc, final boolean autoConvergence, final String vmName, final String destIp) {
99+
final boolean migrateStorage, final boolean migrateNonSharedInc, final boolean autoConvergence, final String vmName, final String destIp, Set<String> migrateDiskLabels) {
91100
this.libvirtComputingResource = libvirtComputingResource;
92101

93102
this.dm = dm;
@@ -98,6 +107,7 @@ public MigrateKVMAsync(final LibvirtComputingResource libvirtComputingResource,
98107
this.autoConvergence = autoConvergence;
99108
this.vmName = vmName;
100109
this.destIp = destIp;
110+
this.migrateDiskLabels = migrateDiskLabels;
101111
}
102112

103113
@Override
@@ -121,6 +131,37 @@ public Domain call() throws LibvirtException {
121131
flags |= VIR_MIGRATE_AUTO_CONVERGE;
122132
}
123133

124-
return dm.migrate(dconn, flags, dxml, vmName, "tcp:" + destIp, libvirtComputingResource.getMigrateSpeed());
134+
TypedParameter [] parameters = createTypedParameterList();
135+
136+
logger.debug(String.format("Migrating [%s] with flags [%s], destination [%s] and speed [%s]. The disks with the following labels will be migrated [%s].", vmName, flags,
137+
destIp, libvirtComputingResource.getMigrateSpeed(), migrateDiskLabels));
138+
139+
return dm.migrate(dconn, parameters, flags);
140+
141+
}
142+
143+
protected TypedParameter[] createTypedParameterList() {
144+
int sizeOfMigrateDiskLabels = 0;
145+
if (migrateDiskLabels != null) {
146+
sizeOfMigrateDiskLabels = migrateDiskLabels.size();
147+
}
148+
149+
TypedParameter[] parameters = new TypedParameter[4 + sizeOfMigrateDiskLabels];
150+
parameters[0] = new TypedStringParameter(Domain.DomainMigrateParameters.VIR_MIGRATE_PARAM_DEST_NAME, vmName);
151+
parameters[1] = new TypedStringParameter(Domain.DomainMigrateParameters.VIR_MIGRATE_PARAM_DEST_XML, dxml);
152+
parameters[2] = new TypedStringParameter(Domain.DomainMigrateParameters.VIR_MIGRATE_PARAM_URI, "tcp:" + destIp);
153+
parameters[3] = new TypedUlongParameter(Domain.DomainMigrateParameters.VIR_MIGRATE_PARAM_BANDWIDTH, libvirtComputingResource.getMigrateSpeed());
154+
155+
if (sizeOfMigrateDiskLabels == 0) {
156+
return parameters;
157+
}
158+
159+
Iterator<String> iterator = migrateDiskLabels.iterator();
160+
for (int i = 0; i < sizeOfMigrateDiskLabels; i++) {
161+
parameters[4 + i] = new TypedStringParameter(Domain.DomainMigrateParameters.VIR_MIGRATE_PARAM_MIGRATE_DISKS, iterator.next());
162+
}
163+
164+
return parameters;
125165
}
166+
126167
}

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.io.InputStream;
2525
import java.net.URISyntaxException;
2626
import java.nio.charset.StandardCharsets;
27+
import java.util.HashSet;
2728
import java.util.List;
2829
import java.util.Map;
2930
import java.util.Set;
@@ -190,6 +191,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
190191
// migrateStorage's value should always only be associated with the initial state of mapMigrateStorage.
191192
final boolean migrateStorage = MapUtils.isNotEmpty(mapMigrateStorage);
192193
final boolean migrateStorageManaged = command.isMigrateStorageManaged();
194+
Set<String> migrateDiskLabels = null;
193195

194196
if (migrateStorage) {
195197
if (s_logger.isDebugEnabled()) {
@@ -199,6 +201,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
199201
if (s_logger.isDebugEnabled()) {
200202
s_logger.debug(String.format("Changed VM [%s] XML configuration of used storage. New XML configuration is [%s].", vmName, xmlDesc));
201203
}
204+
migrateDiskLabels = getMigrateStorageDeviceLabels(disks, mapMigrateStorage);
202205
}
203206

204207
Map<String, DpdkTO> dpdkPortsMapping = command.getDpdkInterfaceMapping();
@@ -227,7 +230,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
227230

228231
final Callable<Domain> worker = new MigrateKVMAsync(libvirtComputingResource, dm, dconn, xmlDesc,
229232
migrateStorage, migrateNonSharedInc,
230-
command.isAutoConvergence(), vmName, command.getDestinationIp());
233+
command.isAutoConvergence(), vmName, command.getDestinationIp(), migrateDiskLabels);
231234
final Future<Domain> migrateThread = executor.submit(worker);
232235
executor.shutdown();
233236
long sleeptime = 0;
@@ -365,6 +368,30 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
365368
return new MigrateAnswer(command, result == null, result, null);
366369
}
367370

371+
/**
372+
* Gets the disk labels (vda, vdb...) of the disks mapped for migration on mapMigrateStorage.
373+
* @param diskDefinitions list of all the disksDefinitions of the VM.
374+
* @param mapMigrateStorage map of the disks that should be migrated.
375+
* @return set with the labels of the disks that should be migrated.
376+
* */
377+
protected Set<String> getMigrateStorageDeviceLabels(List<DiskDef> diskDefinitions, Map<String, MigrateCommand.MigrateDiskInfo> mapMigrateStorage) {
378+
HashSet<String> setOfLabels = new HashSet<>();
379+
s_logger.debug(String.format("Searching for disk labels of disks [%s].", mapMigrateStorage.keySet()));
380+
for (String fileName : mapMigrateStorage.keySet()) {
381+
for (DiskDef diskDef : diskDefinitions) {
382+
String diskPath = diskDef.getDiskPath();
383+
if (diskPath != null && diskPath.contains(fileName)) {
384+
setOfLabels.add(diskDef.getDiskLabel());
385+
s_logger.debug(String.format("Found label [%s] for disk [%s].", diskDef.getDiskLabel(), fileName));
386+
break;
387+
}
388+
}
389+
}
390+
391+
return setOfLabels;
392+
}
393+
394+
368395
/**
369396
* Checks if the CPU shares are equal in the source host and destination host.
370397
* <ul>

‎plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/MigrateKVMAsyncTest.java‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
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+
20+
package com.cloud.hypervisor.kvm.resource;
21+
22+
import org.junit.Assert;
23+
import org.junit.Test;
24+
import org.junit.runner.RunWith;
25+
import org.libvirt.Connect;
26+
import org.libvirt.Domain;
27+
import org.libvirt.TypedParameter;
28+
import org.mockito.Mock;
29+
import org.mockito.Mockito;
30+
import org.mockito.junit.MockitoJUnitRunner;
31+
32+
import java.util.Set;
33+
34+
@RunWith(MockitoJUnitRunner.class)
35+
public class MigrateKVMAsyncTest {
36+
37+
@Mock
38+
private LibvirtComputingResource libvirtComputingResource;
39+
@Mock
40+
private Connect connect;
41+
@Mock
42+
private Domain domain;
43+
44+
45+
@Test
46+
public void createTypedParameterListTestNoMigrateDiskLabels() {
47+
MigrateKVMAsync migrateKVMAsync = new MigrateKVMAsync(libvirtComputingResource, domain, connect, "testxml",
48+
false, false, false, "tst", "1.1.1.1", null);
49+
50+
Mockito.doReturn(10).when(libvirtComputingResource).getMigrateSpeed();
51+
52+
TypedParameter[] result = migrateKVMAsync.createTypedParameterList();
53+
54+
Assert.assertEquals(4, result.length);
55+
56+
Assert.assertEquals("tst", result[0].getValueAsString());
57+
Assert.assertEquals("testxml", result[1].getValueAsString());
58+
Assert.assertEquals("tcp:1.1.1.1", result[2].getValueAsString());
59+
Assert.assertEquals("10", result[3].getValueAsString());
60+
61+
}
62+
63+
@Test
64+
public void createTypedParameterListTestWithMigrateDiskLabels() {
65+
Set<String> labels = Set.of("vda", "vdb");
66+
MigrateKVMAsync migrateKVMAsync = new MigrateKVMAsync(libvirtComputingResource, domain, connect, "testxml",
67+
false, false, false, "tst", "1.1.1.1", labels);
68+
69+
Mockito.doReturn(10).when(libvirtComputingResource).getMigrateSpeed();
70+
71+
TypedParameter[] result = migrateKVMAsync.createTypedParameterList();
72+
73+
Assert.assertEquals(6, result.length);
74+
75+
Assert.assertEquals("tst", result[0].getValueAsString());
76+
Assert.assertEquals("testxml", result[1].getValueAsString());
77+
Assert.assertEquals("tcp:1.1.1.1", result[2].getValueAsString());
78+
Assert.assertEquals("10", result[3].getValueAsString());
79+
80+
Assert.assertEquals(labels, Set.of(result[4].getValueAsString(), result[5].getValueAsString()));
81+
}
82+
83+
}

0 commit comments

Comments
 (0)