Skip to content

Commit 45daa1c

Browse files
weizhouapacheweizhouapache
committed
Merge remote-tracking branch 'apache/4.19'
2 parents 19f79b1 + 44aa08c commit 45daa1c

14 files changed

Lines changed: 542 additions & 135 deletions

File tree

‎api/src/main/java/com/cloud/storage/VolumeApiService.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Account acc
175175

176176
boolean validateVolumeSizeInBytes(long size);
177177

178+
void validateDestroyVolume(Volume volume, Account caller, boolean expunge, boolean forceExpunge);
179+
178180
Volume changeDiskOfferingForVolume(ChangeOfferingForVolumeCmd cmd) throws ResourceAllocationException;
179181

180182
void publishVolumeCreationUsageEvent(Volume volume);

‎api/src/main/java/com/cloud/vm/UserVmService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationExceptio
492492

493493
UserVm restoreVM(RestoreVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException;
494494

495-
UserVm restoreVirtualMachine(Account caller, long vmId, Long newTemplateId) throws InsufficientCapacityException, ResourceUnavailableException;
495+
UserVm restoreVirtualMachine(Account caller, long vmId, Long newTemplateId, Long rootDiskOfferingId, boolean expunge, Map<String, String> details) throws InsufficientCapacityException, ResourceUnavailableException;
496496

497497
UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
498498
VirtualMachineMigrationException;

‎api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
// under the License.
1717
package org.apache.cloudstack.api.command.user.vm;
1818

19-
import org.apache.cloudstack.api.ApiCommandResourceType;
20-
19+
import com.cloud.vm.VmDetailConstants;
2120
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
21+
import org.apache.cloudstack.api.ApiCommandResourceType;
2222
import org.apache.cloudstack.api.ACL;
2323
import org.apache.cloudstack.api.APICommand;
2424
import org.apache.cloudstack.api.ApiConstants;
@@ -28,6 +28,7 @@
2828
import org.apache.cloudstack.api.ResponseObject.ResponseView;
2929
import org.apache.cloudstack.api.ServerApiException;
3030
import org.apache.cloudstack.api.command.user.UserCmd;
31+
import org.apache.cloudstack.api.response.DiskOfferingResponse;
3132
import org.apache.cloudstack.api.response.TemplateResponse;
3233
import org.apache.cloudstack.api.response.UserVmResponse;
3334
import org.apache.cloudstack.context.CallContext;
@@ -41,6 +42,8 @@
4142
import com.cloud.uservm.UserVm;
4243
import com.cloud.vm.VirtualMachine;
4344

45+
import java.util.Map;
46+
4447
@APICommand(name = "restoreVirtualMachine", description = "Restore a VM to original template/ISO or new template/ISO", responseObject = UserVmResponse.class, since = "3.0.0", responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
4548
requestHasSensitiveInfo = false,
4649
responseHasSensitiveInfo = true)
@@ -58,6 +61,28 @@ public class RestoreVMCmd extends BaseAsyncCmd implements UserCmd {
5861
description = "an optional template Id to restore vm from the new template. This can be an ISO id in case of restore vm deployed using ISO")
5962
private Long templateId;
6063

64+
@Parameter(name = ApiConstants.DISK_OFFERING_ID,
65+
type = CommandType.UUID,
66+
entityType = DiskOfferingResponse.class,
67+
description = "Override root volume's diskoffering.", since = "4.19.1")
68+
private Long rootDiskOfferingId;
69+
70+
@Parameter(name = ApiConstants.ROOT_DISK_SIZE,
71+
type = CommandType.LONG,
72+
description = "Override root volume's size (in GB). Analogous to details[0].rootdisksize, which takes precedence over this parameter if both are provided",
73+
since = "4.19.1")
74+
private Long rootDiskSize;
75+
76+
@Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, since = "4.19.1",
77+
description = "used to specify the custom parameters")
78+
private Map details;
79+
80+
@Parameter(name = ApiConstants.EXPUNGE,
81+
type = CommandType.BOOLEAN,
82+
description = "Optional field to expunge old root volume after restore.",
83+
since = "4.19.1")
84+
private Boolean expungeRootDisk;
85+
6186
@Override
6287
public String getEventType() {
6388
return EventTypes.EVENT_VM_RESTORE;
@@ -110,6 +135,22 @@ public Long getId() {
110135
return getVmId();
111136
}
112137

138+
public Long getRootDiskOfferingId() {
139+
return rootDiskOfferingId;
140+
}
141+
142+
public Map<String, String> getDetails() {
143+
Map<String, String> customparameterMap = convertDetailsToMap(details);
144+
if (rootDiskSize != null && !customparameterMap.containsKey(VmDetailConstants.ROOT_DISK_SIZE)) {
145+
customparameterMap.put(VmDetailConstants.ROOT_DISK_SIZE, rootDiskSize.toString());
146+
}
147+
return customparameterMap;
148+
}
149+
150+
public Boolean getExpungeRootDisk() {
151+
return expungeRootDisk != null && expungeRootDisk;
152+
}
153+
113154
@Override
114155
public Long getApiResourceId() {
115156
return getId();

‎engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static String getHypervisorHostname(String name) {
254254
*/
255255
boolean unmanage(String vmUuid);
256256

257-
UserVm restoreVirtualMachine(long vmId, Long newTemplateId) throws ResourceUnavailableException, InsufficientCapacityException;
257+
UserVm restoreVirtualMachine(long vmId, Long newTemplateId, Long rootDiskOfferingId, boolean expunge, Map<String, String> details) throws ResourceUnavailableException, InsufficientCapacityException;
258258

259259
boolean checkIfVmHasClusterWideVolumes(Long vmId);
260260

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5692,20 +5692,20 @@ private VmWorkJobVO createPlaceHolderWork(final long instanceId, String secondar
56925692
}
56935693

56945694
@Override
5695-
public UserVm restoreVirtualMachine(final long vmId, final Long newTemplateId) throws ResourceUnavailableException, InsufficientCapacityException {
5695+
public UserVm restoreVirtualMachine(final long vmId, final Long newTemplateId, final Long rootDiskOfferingId, final boolean expunge, final Map<String, String> details) throws ResourceUnavailableException, InsufficientCapacityException {
56965696
final AsyncJobExecutionContext jobContext = AsyncJobExecutionContext.getCurrentExecutionContext();
56975697
if (jobContext.isJobDispatchedBy(VmWorkConstants.VM_WORK_JOB_DISPATCHER)) {
56985698
VmWorkJobVO placeHolder = null;
56995699
placeHolder = createPlaceHolderWork(vmId);
57005700
try {
5701-
return orchestrateRestoreVirtualMachine(vmId, newTemplateId);
5701+
return orchestrateRestoreVirtualMachine(vmId, newTemplateId, rootDiskOfferingId, expunge, details);
57025702
} finally {
57035703
if (placeHolder != null) {
57045704
_workJobDao.expunge(placeHolder.getId());
57055705
}
57065706
}
57075707
} else {
5708-
final Outcome<VirtualMachine> outcome = restoreVirtualMachineThroughJobQueue(vmId, newTemplateId);
5708+
final Outcome<VirtualMachine> outcome = restoreVirtualMachineThroughJobQueue(vmId, newTemplateId, rootDiskOfferingId, expunge, details);
57095709

57105710
retrieveVmFromJobOutcome(outcome, String.valueOf(vmId), "restoreVirtualMachine");
57115711

@@ -5722,14 +5722,14 @@ public UserVm restoreVirtualMachine(final long vmId, final Long newTemplateId) t
57225722
}
57235723
}
57245724

5725-
private UserVm orchestrateRestoreVirtualMachine(final long vmId, final Long newTemplateId) throws ResourceUnavailableException, InsufficientCapacityException {
5726-
logger.debug("Restoring vm " + vmId + " with new templateId " + newTemplateId);
5725+
private UserVm orchestrateRestoreVirtualMachine(final long vmId, final Long newTemplateId, final Long rootDiskOfferingId, final boolean expunge, final Map<String, String> details) throws ResourceUnavailableException, InsufficientCapacityException {
5726+
logger.debug("Restoring vm " + vmId + " with templateId : " + newTemplateId + " diskOfferingId : " + rootDiskOfferingId + " details : " + details);
57275727
final CallContext context = CallContext.current();
57285728
final Account account = context.getCallingAccount();
5729-
return _userVmService.restoreVirtualMachine(account, vmId, newTemplateId);
5729+
return _userVmService.restoreVirtualMachine(account, vmId, newTemplateId, rootDiskOfferingId, expunge, details);
57305730
}
57315731

5732-
public Outcome<VirtualMachine> restoreVirtualMachineThroughJobQueue(final long vmId, final Long newTemplateId) {
5732+
public Outcome<VirtualMachine> restoreVirtualMachineThroughJobQueue(final long vmId, final Long newTemplateId, final Long rootDiskOfferingId, final boolean expunge, Map<String, String> details) {
57335733
String commandName = VmWorkRestore.class.getName();
57345734
Pair<VmWorkJobVO, Long> pendingWorkJob = retrievePendingWorkJob(vmId, commandName);
57355735

@@ -5739,7 +5739,7 @@ public Outcome<VirtualMachine> restoreVirtualMachineThroughJobQueue(final long v
57395739
Pair<VmWorkJobVO, VmWork> newVmWorkJobAndInfo = createWorkJobAndWorkInfo(commandName, vmId);
57405740

57415741
workJob = newVmWorkJobAndInfo.first();
5742-
VmWorkRestore workInfo = new VmWorkRestore(newVmWorkJobAndInfo.second(), newTemplateId);
5742+
VmWorkRestore workInfo = new VmWorkRestore(newVmWorkJobAndInfo.second(), newTemplateId, rootDiskOfferingId, expunge, details);
57435743

57445744
setCmdInfoAndSubmitAsyncJob(workJob, workInfo, vmId);
57455745
}
@@ -5751,7 +5751,7 @@ public Outcome<VirtualMachine> restoreVirtualMachineThroughJobQueue(final long v
57515751
@ReflectionUse
57525752
private Pair<JobInfo.Status, String> orchestrateRestoreVirtualMachine(final VmWorkRestore work) throws Exception {
57535753
VMInstanceVO vm = findVmById(work.getVmId());
5754-
UserVm uservm = orchestrateRestoreVirtualMachine(vm.getId(), work.getTemplateId());
5754+
UserVm uservm = orchestrateRestoreVirtualMachine(vm.getId(), work.getTemplateId(), work.getRootDiskOfferingId(), work.getExpunge(), work.getDetails());
57555755
HashMap<Long, String> passwordMap = new HashMap<>();
57565756
passwordMap.put(uservm.getId(), uservm.getPassword());
57575757
return new Pair<>(JobInfo.Status.SUCCEEDED, _jobMgr.marshallResultObject(passwordMap));

‎engine/orchestration/src/main/java/com/cloud/vm/VmWorkRestore.java‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,38 @@
1616
// under the License.
1717
package com.cloud.vm;
1818

19+
import java.util.Map;
20+
1921
public class VmWorkRestore extends VmWork {
2022
private static final long serialVersionUID = 195901782359759635L;
2123

2224
private Long templateId;
25+
private Long rootDiskOfferingId;
26+
private Map<String,String> details;
2327

24-
public VmWorkRestore(long userId, long accountId, long vmId, String handlerName, Long templateId) {
25-
super(userId, accountId, vmId, handlerName);
28+
private boolean expunge;
2629

27-
this.templateId = templateId;
28-
}
29-
30-
public VmWorkRestore(VmWork vmWork, Long templateId) {
30+
public VmWorkRestore(VmWork vmWork, Long templateId, Long rootDiskOfferingId, boolean expunge, Map<String,String> details) {
3131
super(vmWork);
3232
this.templateId = templateId;
33+
this.rootDiskOfferingId = rootDiskOfferingId;
34+
this.expunge = expunge;
35+
this.details = details;
3336
}
3437

3538
public Long getTemplateId() {
3639
return templateId;
3740
}
41+
42+
public Long getRootDiskOfferingId() {
43+
return rootDiskOfferingId;
44+
}
45+
46+
public boolean getExpunge() {
47+
return expunge;
48+
}
49+
50+
public Map<String, String> getDetails() {
51+
return details;
52+
}
3853
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
import com.cloud.vm.dao.UserVmDetailsDao;
6262
import com.cloud.vm.dao.VMInstanceDao;
6363

64+
import static org.apache.cloudstack.api.ApiConstants.MAX_IOPS;
65+
import static org.apache.cloudstack.api.ApiConstants.MIN_IOPS;
66+
6467
@Component
6568
public class CloudOrchestrator implements OrchestrationService {
6669

@@ -196,8 +199,8 @@ public VirtualMachineEntity createVirtualMachine(String id, String owner, String
196199
Map<String, String> userVmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
197200

198201
if (userVmDetails != null) {
199-
String minIops = userVmDetails.get("minIops");
200-
String maxIops = userVmDetails.get("maxIops");
202+
String minIops = userVmDetails.get(MIN_IOPS);
203+
String maxIops = userVmDetails.get(MAX_IOPS);
201204

202205
rootDiskOfferingInfo.setMinIops(minIops != null && minIops.trim().length() > 0 ? Long.parseLong(minIops) : null);
203206
rootDiskOfferingInfo.setMaxIops(maxIops != null && maxIops.trim().length() > 0 ? Long.parseLong(maxIops) : null);

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

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -879,32 +879,6 @@ public DiskProfile allocateRawVolume(Type type, String name, DiskOffering offeri
879879
return diskProfile;
880880
}
881881

882-
@Override
883-
public void saveVolumeDetails(Long diskOfferingId, Long volumeId) {
884-
List<VolumeDetailVO> volumeDetailsVO = new ArrayList<>();
885-
DiskOfferingDetailVO bandwidthLimitDetail = _diskOfferingDetailDao.findDetail(diskOfferingId, Volume.BANDWIDTH_LIMIT_IN_MBPS);
886-
if (bandwidthLimitDetail != null) {
887-
volumeDetailsVO.add(new VolumeDetailVO(volumeId, Volume.BANDWIDTH_LIMIT_IN_MBPS, bandwidthLimitDetail.getValue(), false));
888-
} else {
889-
VolumeDetailVO bandwidthLimit = _volDetailDao.findDetail(volumeId, Volume.BANDWIDTH_LIMIT_IN_MBPS);
890-
if (bandwidthLimit != null) {
891-
_volDetailDao.remove(bandwidthLimit.getId());
892-
}
893-
}
894-
DiskOfferingDetailVO iopsLimitDetail = _diskOfferingDetailDao.findDetail(diskOfferingId, Volume.IOPS_LIMIT);
895-
if (iopsLimitDetail != null) {
896-
volumeDetailsVO.add(new VolumeDetailVO(volumeId, Volume.IOPS_LIMIT, iopsLimitDetail.getValue(), false));
897-
} else {
898-
VolumeDetailVO iopsLimit = _volDetailDao.findDetail(volumeId, Volume.IOPS_LIMIT);
899-
if (iopsLimit != null) {
900-
_volDetailDao.remove(iopsLimit.getId());
901-
}
902-
}
903-
if (!volumeDetailsVO.isEmpty()) {
904-
_volDetailDao.saveDetails(volumeDetailsVO);
905-
}
906-
}
907-
908882
private DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm,
909883
Account owner, long deviceId, String configurationId) {
910884
assert (template.getFormat() != ImageFormat.ISO) : "ISO is not a template.";
@@ -948,18 +922,7 @@ private DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering
948922

949923
vol = _volsDao.persist(vol);
950924

951-
List<VolumeDetailVO> volumeDetailsVO = new ArrayList<VolumeDetailVO>();
952-
DiskOfferingDetailVO bandwidthLimitDetail = _diskOfferingDetailDao.findDetail(offering.getId(), Volume.BANDWIDTH_LIMIT_IN_MBPS);
953-
if (bandwidthLimitDetail != null) {
954-
volumeDetailsVO.add(new VolumeDetailVO(vol.getId(), Volume.BANDWIDTH_LIMIT_IN_MBPS, bandwidthLimitDetail.getValue(), false));
955-
}
956-
DiskOfferingDetailVO iopsLimitDetail = _diskOfferingDetailDao.findDetail(offering.getId(), Volume.IOPS_LIMIT);
957-
if (iopsLimitDetail != null) {
958-
volumeDetailsVO.add(new VolumeDetailVO(vol.getId(), Volume.IOPS_LIMIT, iopsLimitDetail.getValue(), false));
959-
}
960-
if (!volumeDetailsVO.isEmpty()) {
961-
_volDetailDao.saveDetails(volumeDetailsVO);
962-
}
925+
saveVolumeDetails(offering.getId(), vol.getId());
963926

964927
if (StringUtils.isNotBlank(configurationId)) {
965928
VolumeDetailVO deployConfigurationDetail = new VolumeDetailVO(vol.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION, configurationId, false);
@@ -983,6 +946,32 @@ private DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering
983946
return toDiskProfile(vol, offering);
984947
}
985948

949+
@Override
950+
public void saveVolumeDetails(Long diskOfferingId, Long volumeId) {
951+
List<VolumeDetailVO> volumeDetailsVO = new ArrayList<>();
952+
DiskOfferingDetailVO bandwidthLimitDetail = _diskOfferingDetailDao.findDetail(diskOfferingId, Volume.BANDWIDTH_LIMIT_IN_MBPS);
953+
if (bandwidthLimitDetail != null) {
954+
volumeDetailsVO.add(new VolumeDetailVO(volumeId, Volume.BANDWIDTH_LIMIT_IN_MBPS, bandwidthLimitDetail.getValue(), false));
955+
} else {
956+
VolumeDetailVO bandwidthLimit = _volDetailDao.findDetail(volumeId, Volume.BANDWIDTH_LIMIT_IN_MBPS);
957+
if (bandwidthLimit != null) {
958+
_volDetailDao.remove(bandwidthLimit.getId());
959+
}
960+
}
961+
DiskOfferingDetailVO iopsLimitDetail = _diskOfferingDetailDao.findDetail(diskOfferingId, Volume.IOPS_LIMIT);
962+
if (iopsLimitDetail != null) {
963+
volumeDetailsVO.add(new VolumeDetailVO(volumeId, Volume.IOPS_LIMIT, iopsLimitDetail.getValue(), false));
964+
} else {
965+
VolumeDetailVO iopsLimit = _volDetailDao.findDetail(volumeId, Volume.IOPS_LIMIT);
966+
if (iopsLimit != null) {
967+
_volDetailDao.remove(iopsLimit.getId());
968+
}
969+
}
970+
if (!volumeDetailsVO.isEmpty()) {
971+
_volDetailDao.saveDetails(volumeDetailsVO);
972+
}
973+
}
974+
986975
@ActionEvent(eventType = EventTypes.EVENT_VOLUME_CREATE, eventDescription = "creating ROOT volume", create = true)
987976
@Override
988977
public List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm,

‎server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,11 +1723,7 @@ public boolean stateTransitTo(Volume vol, Volume.Event event) throws NoTransitio
17231723
return _volStateMachine.transitTo(vol, event, null, _volsDao);
17241724
}
17251725

1726-
@Override
1727-
@ActionEvent(eventType = EventTypes.EVENT_VOLUME_DESTROY, eventDescription = "destroying a volume")
1728-
public Volume destroyVolume(long volumeId, Account caller, boolean expunge, boolean forceExpunge) {
1729-
VolumeVO volume = retrieveAndValidateVolume(volumeId, caller);
1730-
1726+
public void validateDestroyVolume(Volume volume, Account caller, boolean expunge, boolean forceExpunge) {
17311727
if (expunge) {
17321728
// When trying to expunge, permission is denied when the caller is not an admin and the AllowUserExpungeRecoverVolume is false for the caller.
17331729
final Long userId = caller.getAccountId();
@@ -1737,6 +1733,14 @@ public Volume destroyVolume(long volumeId, Account caller, boolean expunge, bool
17371733
} else if (volume.getState() == Volume.State.Allocated || volume.getState() == Volume.State.Uploaded) {
17381734
throw new InvalidParameterValueException("The volume in Allocated/Uploaded state can only be expunged not destroyed/recovered");
17391735
}
1736+
}
1737+
1738+
@Override
1739+
@ActionEvent(eventType = EventTypes.EVENT_VOLUME_DESTROY, eventDescription = "destroying a volume")
1740+
public Volume destroyVolume(long volumeId, Account caller, boolean expunge, boolean forceExpunge) {
1741+
VolumeVO volume = retrieveAndValidateVolume(volumeId, caller);
1742+
1743+
validateDestroyVolume(volume, caller, expunge, forceExpunge);
17401744

17411745
destroyVolumeIfPossible(volume);
17421746

0 commit comments

Comments
 (0)