apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added cleanup of affinitygroups when a VM is expunging and when the account is deleted.

Browse Source
This commit is contained in:
Prachi Damle 2013-04-03 16:53:57 -07:00
parent ec3f844ef1
commit 0b3850c14f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -42,6 +42,7 @@ import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd; import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd; import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
import org.apache.cloudstack.api.command.admin.user.RegisterCmd; import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
@ -220,6 +221,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
@Inject @Inject
private AutoScaleManager _autoscaleMgr; private AutoScaleManager _autoscaleMgr;
@Inject VolumeManager volumeMgr; @Inject VolumeManager volumeMgr;
@Inject
private AffinityGroupDao _affinityGroupDao;
private List<UserAuthenticator> _userAuthenticators; private List<UserAuthenticator> _userAuthenticators;
List<UserAuthenticator> _userPasswordEncoders; List<UserAuthenticator> _userPasswordEncoders;
@ -238,7 +241,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
public List<UserAuthenticator> getUserAuthenticators() { public List<UserAuthenticator> getUserAuthenticators() {
return _userAuthenticators; return _userAuthenticators;
} }
public void setUserAuthenticators(List<UserAuthenticator> authenticators) { public void setUserAuthenticators(List<UserAuthenticator> authenticators) {
_userAuthenticators = authenticators; _userAuthenticators = authenticators;
} }
@ -623,6 +626,10 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
int numRemoved = _securityGroupDao.removeByAccountId(accountId); int numRemoved = _securityGroupDao.removeByAccountId(accountId);
s_logger.info("deleteAccount: Deleted " + numRemoved + " network groups for account " + accountId); s_logger.info("deleteAccount: Deleted " + numRemoved + " network groups for account " + accountId);
// Cleanup affinity groups
int numAGRemoved = _affinityGroupDao.removeByAccountId(accountId);
s_logger.info("deleteAccount: Deleted " + numAGRemoved + " affinity groups for account " + accountId);
// Delete all the networks // Delete all the networks
boolean networksDeleted = true; boolean networksDeleted = true;
s_logger.debug("Deleting networks for account " + account.getId()); s_logger.debug("Deleting networks for account " + account.getId());

5
server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
View File

@ -240,6 +240,7 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro
@Override @Override
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException { public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_name = name; _name = name;
VirtualMachine.State.getStateMachine().registerListener(this);
return true; return true;
} }
@ -308,9 +309,7 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro
throw new InvalidParameterValueException("Unable to find affinity group by id " + affinityGroupId); throw new InvalidParameterValueException("Unable to find affinity group by id " + affinityGroupId);
} }
} }
if (affinityGroupIds != null && !affinityGroupIds.isEmpty()) { _affinityGroupVMMapDao.updateMap(vmId, affinityGroupIds);
_affinityGroupVMMapDao.updateMap(vmId, affinityGroupIds);
}
// APIResponseHelper will pull out the updated affinitygroups. // APIResponseHelper will pull out the updated affinitygroups.
return vmInstance; return vmInstance;