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

network: set restart_required to 0 after restarting network (#3803) 

After restarting the network with or without cleanup option, the restart_required field in networks table should be reset to 0.
This commit is contained in:
Rakesh 2020-01-30 06:42:38 +01:00 committed by GitHub
parent a54afa820e
commit 920531f42d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2936,7 +2936,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
@Override
public boolean restartNetwork(final Long networkId, final Account callerAccount, final User callerUser, final boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException {
boolean status = true;
boolean restartRequired = false;
final NetworkVO network = _networksDao.findById(networkId);
s_logger.debug("Restarting network " + networkId + "...");
@ -2947,16 +2948,17 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
if (cleanup) {
if (!rollingRestartRouters(network, offering, dest, context)) {
setRestartRequired(network, true);
return false;
status = false;
restartRequired = true;
}
return true;
setRestartRequired(network, restartRequired);
return status;
}
s_logger.debug("Implementing the network " + network + " elements and resources as a part of network restart without cleanup");
try {
implementNetworkElementsAndResources(dest, context, network, offering);
setRestartRequired(network, true);
setRestartRequired(network, false);
return true;
} catch (final Exception ex) {
s_logger.warn("Failed to implement network " + network + " elements and resources as a part of network restart due to ", ex);