Skip to content

Fix volume allocation on local VMFS storage #10201

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

Merged
DaanHoogland merged 1 commit into from
Jan 30, 2025
Merged

Fix volume allocation on local VMFS storage #10201

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
16 changes: 12 additions & 4 deletions ...e/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,18 +126,24 @@ public List<StoragePool> allocateToPool(DiskProfile dskCh, VirtualMachineProfile
protected List<StoragePool> reorderPoolsByCapacity(DeploymentPlan plan, List<StoragePool> pools) {
Long zoneId = plan.getDataCenterId();
Long clusterId = plan.getClusterId();
short capacityType;

if (CollectionUtils.isEmpty(pools)) {
return null;
}

if (pools.get(0).getPoolType().isShared()) {
Comment thread
weizhouapache marked this conversation as resolved.
short capacityType = Capacity.CAPACITY_TYPE_LOCAL_STORAGE;
String storageType = "local";
StoragePool storagePool = pools.get(0);
if (storagePool.isShared()) {
capacityType = Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED;
} else {
capacityType = Capacity.CAPACITY_TYPE_LOCAL_STORAGE;
storageType = "shared";
}

s_logger.debug(String.format(
"Filtering storage pools by capacity type [%s] as the first storage pool of the list, with name [%s] and ID [%s], is a [%s] storage.",
capacityType, storagePool.getName(), storagePool.getUuid(), storageType
));

List<Long> poolIdsByCapacity = capacityDao.orderHostsByFreeCapacity(zoneId, clusterId, capacityType);

s_logger.debug(String.format("List of pools in descending order of available capacity [%s].", poolIdsByCapacity));
Expand Down Expand Up @@ -223,6 +229,8 @@ public List<StoragePool> reorderPools(List<StoragePool> pools, VirtualMachinePro
}

List<StoragePool> reorderStoragePoolsBasedOnAlgorithm(List<StoragePool> pools, DeploymentPlan plan, Account account) {
s_logger.debug(String.format("Using allocation algorithm [%s] to reorder pools.", allocationAlgorithm));

if (allocationAlgorithm.equals("random") || allocationAlgorithm.equals("userconcentratedpod_random") || (account == null)) {
reorderRandomPools(pools);
} else if (StringUtils.equalsAny(allocationAlgorithm, "userdispersing", "firstfitleastconsumed")) {
Expand Down