mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	Revert "Fixing an issue introduced with Review Request 22717"
This reverts commit 12e92e10ffbd9f86ebff11c2a1b22c5bafafb3d1.
This commit is contained in:
		
							parent
							
								
									890e71cb5c
								
							
						
					
					
						commit
						32ed9d86ec
					
				| @ -34,7 +34,6 @@ import com.cloud.deploy.DeploymentPlan; | ||||
| import com.cloud.deploy.DeploymentPlanner.ExcludeList; | ||||
| import com.cloud.hypervisor.Hypervisor.HypervisorType; | ||||
| import com.cloud.storage.StoragePool; | ||||
| import com.cloud.storage.Volume; | ||||
| import com.cloud.user.Account; | ||||
| import com.cloud.vm.DiskProfile; | ||||
| import com.cloud.vm.VirtualMachineProfile; | ||||
| @ -101,16 +100,6 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator { | ||||
|         return suitablePools; | ||||
|     } | ||||
| 
 | ||||
|     @Override | ||||
|     protected boolean filter(ExcludeList avoid, StoragePool pool, DiskProfile dskCh, DeploymentPlan plan) { | ||||
|         Volume volume = _volumeDao.findById(dskCh.getVolumeId()); | ||||
|         List<Volume> requestVolumes = new ArrayList<Volume>(); | ||||
| 
 | ||||
|         requestVolumes.add(volume); | ||||
| 
 | ||||
|         return storageMgr.storagePoolHasEnoughIops(requestVolumes, pool) && storageMgr.storagePoolHasEnoughSpace(requestVolumes, pool); | ||||
|     } | ||||
| 
 | ||||
|     @Override | ||||
|     protected List<StoragePool> reorderPoolsByNumberOfVolumes(DeploymentPlan plan, List<StoragePool> pools, Account account) { | ||||
|         if (account == null) { | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user