Skip to content

Commit e1da875

Browse files
author
Julien Hervot de Mattos Vaz
committed
Apply suggestions
1 parent e239147 commit e1da875

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected List<StoragePool> reorderPoolsByCapacity(DeploymentPlan plan, List<Sto
137137
storageType = "shared";
138138
}
139139

140-
logger.debug(
140+
logger.info(
141141
"Filtering storage pools by capacity type [{}] as the first storage pool of the list, with name [{}] and ID [{}], is a [{}] storage.",
142142
capacityType, storagePool.getName(), storagePool.getUuid(), storageType
143143
);
@@ -195,10 +195,10 @@ protected List<StoragePool> reorderPoolsByNumberOfVolumes(DeploymentPlan plan, L
195195
@Override
196196
public List<StoragePool> reorderPools(List<StoragePool> pools, VirtualMachineProfile vmProfile, DeploymentPlan plan, DiskProfile dskCh) {
197197
if (pools == null) {
198-
logger.debug("There are no pools to reorder; returning null.");
198+
logger.info("There are no pools to reorder; returning null.");
199199
return null;
200200
}
201-
logger.debug("Reordering [{}] pools", pools.size());
201+
logger.info("Reordering [{}] pools", pools.size());
202202
Account account = null;
203203
if (vmProfile.getVirtualMachine() != null) {
204204
account = vmProfile.getOwner();
@@ -207,7 +207,7 @@ public List<StoragePool> reorderPools(List<StoragePool> pools, VirtualMachinePro
207207
pools = reorderStoragePoolsBasedOnAlgorithm(pools, plan, account);
208208

209209
if (vmProfile.getVirtualMachine() == null) {
210-
logger.debug("The VM is null, skipping pool reordering by disk provisioning type.");
210+
logger.info("The VM is null, skipping pool reordering by disk provisioning type.");
211211
return pools;
212212
}
213213

@@ -220,7 +220,7 @@ public List<StoragePool> reorderPools(List<StoragePool> pools, VirtualMachinePro
220220
}
221221

222222
List<StoragePool> reorderStoragePoolsBasedOnAlgorithm(List<StoragePool> pools, DeploymentPlan plan, Account account) {
223-
logger.debug("Using allocation algorithm [{}] to reorder pools.", allocationAlgorithm);
223+
logger.info("Using allocation algorithm [{}] to reorder pools.", allocationAlgorithm);
224224

225225
if (allocationAlgorithm.equals("random") || allocationAlgorithm.equals("userconcentratedpod_random") || (account == null)) {
226226
reorderRandomPools(pools);
@@ -246,7 +246,7 @@ void reorderRandomPools(List<StoragePool> pools) {
246246

247247
private List<StoragePool> reorderPoolsByDiskProvisioningType(List<StoragePool> pools, DiskProfile diskProfile) {
248248
if (diskProfile != null && diskProfile.getProvisioningType() != null && !diskProfile.getProvisioningType().equals(Storage.ProvisioningType.THIN)) {
249-
logger.debug("Reordering [{}] pools by disk provisioning type [{}].", pools.size(), diskProfile.getProvisioningType());
249+
logger.info("Reordering [{}] pools by disk provisioning type [{}].", pools.size(), diskProfile.getProvisioningType());
250250
List<StoragePool> reorderedPools = new ArrayList<>();
251251
int preferredIndex = 0;
252252
for (StoragePool pool : pools) {
@@ -263,7 +263,11 @@ private List<StoragePool> reorderPoolsByDiskProvisioningType(List<StoragePool> p
263263
logger.debug("Reordered list of pools by disk provisioning type [{}]: [{}]", diskProfile.getProvisioningType(), pools);
264264
return reorderedPools;
265265
} else {
266-
logger.debug("Reordering pools by disk provisioning type wasn't necessary.");
266+
if (diskProfile == null) {
267+
logger.info("Reordering pools by disk provisioning type wasn't necessary, since no disk profile was found.");
268+
} else {
269+
logger.debug("Reordering pools by disk provisioning type wasn't necessary, since the provisioning type is [{}].", diskProfile.getProvisioningType());
270+
}
267271
return pools;
268272
}
269273
}

0 commit comments

Comments
 (0)