etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Murali Reddy 2011-06-22 13:00:59 +05:30
parent 4fcb406f2b
commit 1d4bee51e7
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -586,6 +586,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;

1
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -1592,6 +1592,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;

1
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -2319,6 +2319,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;