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

bug 8103: don't allow to remove host if it has Running/Stopping/Starting vms 

status 8103: resolved fixed
This commit is contained in:
alena 2011-03-25 17:29:54 -07:00
parent a8cc285ca9
commit bb895a7b75
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/host/Status.java
View File

@ -143,7 +143,6 @@ public enum Status {
s_fsm.addTransition(Status.PrepareForMaintenance, Event.AgentConnected, Status.PrepareForMaintenance);
s_fsm.addTransition(Status.PrepareForMaintenance, Event.HostDown, Status.PrepareForMaintenance);
s_fsm.addTransition(Status.PrepareForMaintenance, Event.UnableToMigrate, Status.ErrorInMaintenance);
s_fsm.addTransition(Status.PrepareForMaintenance, Event.Remove, Status.Removed);
s_fsm.addTransition(Status.PrepareForMaintenance, Event.Ping, Status.PrepareForMaintenance);
s_fsm.addTransition(Status.PrepareForMaintenance, Event.ManagementServerDown, Status.PrepareForMaintenance);
s_fsm.addTransition(Status.ErrorInMaintenance, Event.MaintenanceRequested, Status.PrepareForMaintenance);

8
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -1144,6 +1144,14 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
@Override
@DB
public boolean deleteHost(long hostId) {
//Check if there are vms running/starting/stopping on this host
List<VMInstanceVO> vms = _vmDao.listByHostId(hostId);
if (!vms.isEmpty()) {
throw new CloudRuntimeException("Unable to delete the host as there are vms in " + vms.get(0).getState() + " state using this host");
}
Transaction txn = Transaction.currentTxn();
try {
HostVO host = _hostDao.findById(hostId);