DaanHoogland commented on a change in pull request #2508: CLOUDSTACK-9114:
Reduce VR downtime during network restart
URL: https://github.com/apache/cloudstack/pull/2508#discussion_r186144706
##########
File path:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
##########
@@ -2868,6 +2849,89 @@ public boolean restartNetwork(final Long networkId,
final Account callerAccount,
}
}
+ @Override
+ public void destroyExpendableRouters(final List<? extends VirtualRouter>
routers, final ReservationContext context) throws ResourceUnavailableException {
+ final List<VirtualRouter> remainingRouters = new ArrayList<>();
+ for (final VirtualRouter router : routers) {
+ if (router.getState() == VirtualMachine.State.Stopped ||
+ router.getState() == VirtualMachine.State.Error ||
+ router.getState() == VirtualMachine.State.Shutdowned ||
+ router.getState() == VirtualMachine.State.Unknown) {
+ s_logger.debug("Destroying old router " + router);
+ _routerService.destroyRouter(router.getId(),
context.getAccount(), context.getCaller().getId());
+ } else {
+ remainingRouters.add(router);
+ }
+ }
+
+ if (remainingRouters.size() < 2) {
+ return;
+ }
+
+ VirtualRouter backupRouter = null;
+ for (final VirtualRouter router : remainingRouters) {
+ if (router.getRedundantState() ==
VirtualRouter.RedundantState.BACKUP) {
+ backupRouter = router;
+ }
+ }
+ if (backupRouter == null) {
+ backupRouter = routers.get(routers.size() - 1);
+ }
+ if (backupRouter != null) {
+ _routerService.destroyRouter(backupRouter.getId(),
context.getAccount(), context.getCaller().getId());
Review comment:
got it @rhtyd. I still dread this public method being called from places
that do not intent what it was programmed to do. As in this method a backup
router will be destroyed no matter what. How about adding some javadoc:
```
/**
* This method will first destroy and router in state Stopped, Error,
Shutdowned or Unknown
* Afterthat it will destroy any backup router or, if it can find non the
last router in the list
*/
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
