apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

NaaS: Destroy virtual router when cleanup=true at shutdown

Browse Source 
As we did in the restart() function.
This commit is contained in:
Sheng Yang 2011-10-27 14:22:41 -07:00
parent e1e96c0bb3
commit bf4e21f315
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,8 +357,16 @@ public class VirtualRouterElement extends DhcpElement implements VirtualRouterEl
} }
boolean result = true; boolean result = true;
for (DomainRouterVO router : routers) { for (DomainRouterVO router : routers) {
//FIXME - Sheng, for your redundant router you have to destroy the domR here if clenaup=true - just the way you did in restart() method
result = result && _routerMgr.stop(router, false, context.getCaller(), context.getAccount()) != null; result = result && _routerMgr.stop(router, false, context.getCaller(), context.getAccount()) != null;
if (cleanup) {
if (!result) {
s_logger.warn("Failed to stop virtual router element " + router + ", but would try to process clean up anyway.");
}
result = (_routerMgr.destroyRouter(router.getId()) != null);
if (!result) {
s_logger.warn("Failed to clean up virtual router element " + router);
}
}
} }
return result; return result;
} }