mirror of https://github.com/apache/cloudstack.git
Bug 10012: Vague error event created when user attempted to exceed limit set for a given resource
status 10012: resolved fixed
This commit is contained in:
parent
250bd2162f
commit
34a36b7009
|
|
@ -570,6 +570,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
|
|||
// Check that the maximum number of public IPs for the given
|
||||
// accountId will not be exceeded
|
||||
if (_accountMgr.resourceLimitExceeded(accountToLock, ResourceType.public_ip)) {
|
||||
UserContext.current().setEventDetails("Maximum number of public IP addresses for account: " + accountToLock.getAccountName() + " has been exceeded.");
|
||||
ResourceAllocationException rae = new ResourceAllocationException("Maximum number of public IP addresses for account: " + accountToLock.getAccountName() + " has been exceeded.");
|
||||
rae.setResourceType("ip");
|
||||
throw rae;
|
||||
|
|
|
|||
|
|
@ -1580,6 +1580,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
|
|||
// check if the volume can be created for the user
|
||||
// Check that the resource limit for volumes won't be exceeded
|
||||
if (_accountMgr.resourceLimitExceeded(targetAccount, ResourceType.volume)) {
|
||||
UserContext.current().setEventDetails("Maximum number of volumes for account: " + targetAccount.getAccountName() + " has been exceeded.");
|
||||
ResourceAllocationException rae = new ResourceAllocationException("Maximum number of volumes for account: " + targetAccount.getAccountName() + " has been exceeded.");
|
||||
rae.setResourceType("volume");
|
||||
throw rae;
|
||||
|
|
|
|||
|
|
@ -2316,6 +2316,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
|
|||
|
||||
// check if account/domain is with in resource limits to create a new vm
|
||||
if (_accountMgr.resourceLimitExceeded(owner, ResourceType.user_vm)) {
|
||||
UserContext.current().setEventDetails("Maximum number of virtual machines for account: " + owner.getAccountName() + " has been exceeded.");
|
||||
ResourceAllocationException rae = new ResourceAllocationException("Maximum number of virtual machines for account: " + owner.getAccountName() + " has been exceeded.");
|
||||
rae.setResourceType("vm");
|
||||
throw rae;
|
||||
|
|
|
|||
Loading…
Reference in New Issue