From 9cf57d2568764cd42d21bc53e5ffaf97f3380732 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 25 Oct 2018 09:20:39 +0530 Subject: [PATCH] network: on rolling restart force stop old routers (#2926) This force stops old VRs when performing rolling restart with cleanup=true. This will ensure that VRs are powered off quickly than wait longer for the normal ACPI shutdown. During testing, it was found on VMware where VM stops are slow compared to XenServer and KVM. Signed-off-by: Rohit Yadav --- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 1 + server/src/com/cloud/network/vpc/VpcManagerImpl.java | 1 + 2 files changed, 2 insertions(+) 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 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // 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 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis // Destroy old routers for (final DomainRouterVO oldRouter : oldRouters) { + _routerService.stopRouter(oldRouter.getId(), true); _routerService.destroyRouter(oldRouter.getId(), context.getAccount(), context.getCaller().getId()); }