apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 18:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up restart Network

Browse Source
This commit is contained in:
Sheng Yang 2011-08-10 15:02:08 -07:00
parent 9569a7bbee
commit 94f93a60c3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2409,13 +2409,23 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
s_logger.debug("Restarting network elements for the network " + network); s_logger.debug("Restarting network elements for the network " + network);
for (NetworkElement element : _networkElements) { for (NetworkElement element : _networkElements) {
// stop and start the network element // stop and start the network element
if (!element.restart(network, context)) { try {
s_logger.warn("Failed to restart network element(s) as a part of network id" + networkId + " restart"); boolean supported = element.restart(network, context);
if (!supported) {
s_logger.trace("Network element(s) " + element.getName() + " doesn't support network id" + networkId + " restart");
}
} catch (Exception ex) {
s_logger.warn("Failed to restart network element" + element.getName() + " as a part of network id" + networkId + " restart", ex);
success = false; success = false;
} }
} }
} }
if (!success) {
return false;
}
// associate all ip addresses // associate all ip addresses
if (!applyIpAssociations(network, false)) { if (!applyIpAssociations(network, false)) {
s_logger.warn("Failed to apply ip addresses as a part of network id" + networkId + " restart"); s_logger.warn("Failed to apply ip addresses as a part of network id" + networkId + " restart");

2
server/src/com/cloud/network/element/VirtualRouterElement.java
View File

@ -152,7 +152,7 @@ public class VirtualRouterElement extends DhcpElement implements NetworkElement,
long host_id = 0; long host_id = 0;
for (DomainRouterVO router : routers) { for (DomainRouterVO router : routers) {
host_id = router.getHostId(); host_id = router.getHostId();
/* TODO it's not completely safe to ignore these failure, but we would try to push on now */ /* FIXME it's not completely safe to ignore these failure, but we would try to push on now */
if (_routerMgr.stopRouter(router.getId(), false) == null) { if (_routerMgr.stopRouter(router.getId(), false) == null) {
s_logger.warn("Failed to stop virtual router element " + router + " as a part of network " + network + " restart"); s_logger.warn("Failed to stop virtual router element " + router + " as a part of network " + network + " restart");
} }