@@ -145,7 +145,7 @@ protected List<StoragePool> reorderPoolsByCapacity(DeploymentPlan plan, List<Sto
145
145
storageType = "shared" ;
146
146
}
147
147
148
- logger .debug (
148
+ logger .info (
149
149
"Filtering storage pools by capacity type [{}] as the first storage pool of the list, with name [{}] and ID [{}], is a [{}] storage." ,
150
150
capacityType , storagePool .getName (), storagePool .getUuid (), storageType
151
151
);
@@ -207,10 +207,10 @@ protected List<StoragePool> reorderPoolsByNumberOfVolumes(DeploymentPlan plan, L
207
207
@ Override
208
208
public List <StoragePool > reorderPools (List <StoragePool > pools , VirtualMachineProfile vmProfile , DeploymentPlan plan , DiskProfile dskCh ) {
209
209
if (pools == null ) {
210
- logger .debug ("There are no pools to reorder; returning null." );
210
+ logger .info ("There are no pools to reorder; returning null." );
211
211
return null ;
212
212
}
213
- logger .debug ("Reordering [{}] pools" , pools .size ());
213
+ logger .info ("Reordering [{}] pools" , pools .size ());
214
214
Account account = null ;
215
215
if (vmProfile .getVirtualMachine () != null ) {
216
216
account = vmProfile .getOwner ();
@@ -219,7 +219,7 @@ public List<StoragePool> reorderPools(List<StoragePool> pools, VirtualMachinePro
219
219
pools = reorderStoragePoolsBasedOnAlgorithm (pools , plan , account );
220
220
221
221
if (vmProfile .getVirtualMachine () == null ) {
222
- logger .debug ("The VM is null, skipping pool reordering by disk provisioning type." );
222
+ logger .info ("The VM is null, skipping pool reordering by disk provisioning type." );
223
223
return pools ;
224
224
}
225
225
@@ -233,7 +233,7 @@ public List<StoragePool> reorderPools(List<StoragePool> pools, VirtualMachinePro
233
233
234
234
List <StoragePool > reorderStoragePoolsBasedOnAlgorithm (List <StoragePool > pools , DeploymentPlan plan , Account account ) {
235
235
String volumeAllocationAlgorithm = VolumeOrchestrationService .VolumeAllocationAlgorithm .value ();
236
- logger .debug ("Using volume allocation algorithm {} to reorder pools." , volumeAllocationAlgorithm );
236
+ logger .info ("Using volume allocation algorithm {} to reorder pools." , volumeAllocationAlgorithm );
237
237
if (volumeAllocationAlgorithm .equals ("random" ) || volumeAllocationAlgorithm .equals ("userconcentratedpod_random" ) || (account == null )) {
238
238
reorderRandomPools (pools );
239
239
} else if (StringUtils .equalsAny (volumeAllocationAlgorithm , "userdispersing" , "firstfitleastconsumed" )) {
@@ -256,7 +256,7 @@ void reorderRandomPools(List<StoragePool> pools) {
256
256
257
257
private List <StoragePool > reorderPoolsByDiskProvisioningType (List <StoragePool > pools , DiskProfile diskProfile ) {
258
258
if (diskProfile != null && diskProfile .getProvisioningType () != null && !diskProfile .getProvisioningType ().equals (Storage .ProvisioningType .THIN )) {
259
- logger .debug ("Reordering [{}] pools by disk provisioning type [{}]." , pools .size (), diskProfile .getProvisioningType ());
259
+ logger .info ("Reordering [{}] pools by disk provisioning type [{}]." , pools .size (), diskProfile .getProvisioningType ());
260
260
List <StoragePool > reorderedPools = new ArrayList <>();
261
261
int preferredIndex = 0 ;
262
262
for (StoragePool pool : pools ) {
@@ -273,7 +273,11 @@ private List<StoragePool> reorderPoolsByDiskProvisioningType(List<StoragePool> p
273
273
logger .debug ("Reordered list of pools by disk provisioning type [{}]: [{}]" , diskProfile .getProvisioningType (), pools );
274
274
return reorderedPools ;
275
275
} else {
276
- logger .debug ("Reordering pools by disk provisioning type wasn't necessary." );
276
+ if (diskProfile == null ) {
277
+ logger .info ("Reordering pools by disk provisioning type wasn't necessary, since no disk profile was found." );
278
+ } else {
279
+ logger .debug ("Reordering pools by disk provisioning type wasn't necessary, since the provisioning type is [{}]." , diskProfile .getProvisioningType ());
280
+ }
277
281
return pools ;
278
282
}
279
283
}
0 commit comments