Skip to content

CLVM/ISO: Ensure volume is created on the same host as the VM being deployed on #13748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Pearl1594 wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −0
Draft

CLVM/ISO: Ensure volume is created on the same host as the VM being deployed on #13748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...stration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@

@DB
@Override
public VolumeInfo createVolumeFromSnapshot(Volume volume, Snapshot snapshot, UserVm vm) throws StorageUnavailableException {

Check warning on line 525 in engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A "Brain Method" was detected. Refactor it to reduce at least one of the following metrics: LOC from 120 to 64, Complexity from 23 to 14, Nesting Level from 3 to 2, Number of Variables from 43 to 6. 


See more on https://sonarcloud.io/project/issues?id=apache_cloudstack&issues=AZ-zIKTjPnLRl4aBGYbt&open=AZ-zIKTjPnLRl4aBGYbt&pullRequest=13748
String volumeToString = getReflectOnlySelectedFields(volume);

Account account = _entityMgr.findById(Account.class, volume.getAccountId());
Expand Down Expand Up @@ -1080,7 +1080,7 @@
return diskProfile;
}

private DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm,

Check warning on line 1083 in engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A "Brain Method" was detected. Refactor it to reduce at least one of the following metrics: LOC from 72 to 64, Complexity from 17 to 14, Nesting Level from 3 to 2, Number of Variables from 22 to 6. 


See more on https://sonarcloud.io/project/issues?id=apache_cloudstack&issues=AZ-zIKTjPnLRl4aBGYbu&open=AZ-zIKTjPnLRl4aBGYbu&pullRequest=13748
Account owner, long deviceId, String configurationId, Long kmsKeyId, Volume volume, Snapshot snapshot) {
assert (template.getFormat() != ImageFormat.ISO) : "ISO is not a template.";

Expand Down Expand Up @@ -2025,6 +2025,17 @@

volume = volFactory.getVolume(newVol.getId(), destPool);

// CLVM: pin templateless volume creation to the deploy host
StoragePoolVO poolVO = _storagePoolDao.findById(destPool.getId());
if (poolVO != null && ClvmPoolManager.isClvmPoolType(poolVO.getPoolType())) {
Long hostId = vm.getVirtualMachine().getHostId();
if (hostId != null) {
Comment on lines +2028 to +2032
volume.setDestinationHostId(hostId);
clvmPoolManager.setClvmLockHostId(volume.getId(), hostId);
logger.info("CLVM pool detected during volume creation without a template. Setting lock host {} for volume {} "
+ "to route creation to correct host", hostId, volume.getUuid());
}
}
future = volService.createVolumeAsync(volume, destPool);
} else {
final VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, templateId);
Expand Down Expand Up @@ -2254,7 +2265,7 @@
}

@Override
public void prepare(VirtualMachineProfile vm, DeployDestination dest) throws StorageUnavailableException, InsufficientStorageCapacityException, ConcurrentOperationException, StorageAccessException, ResourceAllocationException {

Check warning on line 2268 in engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A "Brain Method" was detected. Refactor it to reduce at least one of the following metrics: LOC from 79 to 64, Complexity from 21 to 14, Nesting Level from 5 to 2, Number of Variables from 25 to 6. 


See more on https://sonarcloud.io/project/issues?id=apache_cloudstack&issues=AZ-zIKTjPnLRl4aBGYbv&open=AZ-zIKTjPnLRl4aBGYbv&pullRequest=13748
if (dest == null) {
String msg = String.format("Unable to prepare volumes for the VM [%s] because DeployDestination is null.", vm.getVirtualMachine());
logger.error(msg);
Expand Down
Loading