rhtyd closed pull request #2926: network: on rolling restart force stop old
routers
URL: https://github.com/apache/cloudstack/pull/2926
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 55015ce68af..9f4778e6d22 100644
---
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -2959,6 +2959,7 @@ private boolean rollingRestartRouters(final NetworkVO
network, final NetworkOffe
// Destroy old routers
for (final DomainRouterVO oldRouter : oldRouters) {
+ _routerService.stopRouter(oldRouter.getId(), true);
_routerService.destroyRouter(oldRouter.getId(),
context.getAccount(), context.getCaller().getId());
}
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index b8a797b44bc..548fb4de35e 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -2490,6 +2490,7 @@ private boolean rollingRestartVpc(final Vpc vpc, final
ReservationContext contex
// Destroy old routers
for (final DomainRouterVO oldRouter : oldRouters) {
+ _routerService.stopRouter(oldRouter.getId(), true);
_routerService.destroyRouter(oldRouter.getId(),
context.getAccount(), context.getCaller().getId());
}
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
