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

someone had commented out the domr code in the storage maintenance, enabling the same

This commit is contained in:
abhishek 2010-12-27 15:24:34 -08:00
parent bb088a2e4c
commit 344a151ffe
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
View File

@ -73,6 +73,8 @@ public interface VirtualNetworkApplianceManager extends Manager {
boolean getRouterStatistics(long vmId, Map<String, long[]> netStats, Map<String, long[]> diskStats);
boolean rebootRouter(long routerId);
VirtualRouter startRouter(long routerId) throws ResourceUnavailableException, InsufficientCapacityException, ConcurrentOperationException;
/**
* @param hostId get all of the virtual machine routers on a host.

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

@ -2278,14 +2278,14 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
}
else if(restart)
{
// FIXME if(_routerMgr.startRouter(vmInstance.getId(), eventId)==null)
// {
// String errorMsg = "There was an error starting the domain router id: "+vmInstance.getId()+" on another storage pool, cannot enable primary storage maintenance";
// s_logger.warn(errorMsg);
// primaryStorage.setStatus(Status.ErrorInMaintenance);
// _storagePoolDao.persist(primaryStorage);
// throw new CloudRuntimeException(errorMsg);
// }
if(_routerMgr.startRouter(vmInstance.getId()) == null)
{
String errorMsg = "There was an error starting the domain router id: "+vmInstance.getId()+" on another storage pool, cannot enable primary storage maintenance";
s_logger.warn(errorMsg);
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
throw new CloudRuntimeException(errorMsg);
}
}
}
}