etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VR live patching: Allow live patch of VPC VRs even if networks are in allocated / shutdown state (#7958)

This commit is contained in:
Pearl Dsilva 2023-09-25 11:04:23 -04:00 committed by GitHub
parent 3071ad69f6
commit 951ba04cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View File

@ -28,6 +28,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Executors;
@ -3516,7 +3517,12 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
setRestartRequired(network, restartRequired);
return status;
} else if (livePatch) {
List<DomainRouterVO> domainRouters = routerDao.listByNetworkAndRole(network.getId(), VirtualRouter.Role.VIRTUAL_ROUTER, VirtualRouter.Role.INTERNAL_LB_VM);
List<DomainRouterVO> domainRouters;
if (Objects.nonNull(network.getVpcId())) {
domainRouters = routerDao.listByVpcId(network.getVpcId());
} else {
domainRouters = routerDao.listByNetworkAndRole(network.getId(), VirtualRouter.Role.VIRTUAL_ROUTER, VirtualRouter.Role.INTERNAL_LB_VM);
}
for (DomainRouterVO router: domainRouters) {
try {
VMInstanceVO instanceVO = _vmDao.findById(router.getId());