Repository: cloudstack Updated Branches: refs/heads/master 71767cfe8 -> 8218ce0fe
unexplained happy flow for restart network modified Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8218ce0f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8218ce0f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8218ce0f Branch: refs/heads/master Commit: 8218ce0fe243d85d0f4cb6280d2310a81c8e99de Parents: 71767cf Author: Daan Hoogland <d...@onecht.net> Authored: Thu Oct 23 20:53:09 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Thu Oct 23 20:57:33 2014 +0200 ---------------------------------------------------------------------- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8218ce0f/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java ---------------------------------------------------------------------- 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 ab5a21c..8b47289 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -2464,12 +2464,11 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { implementNetworkElementsAndResources(dest, context, network, offering); setRestartRequired(network, true); + return true; } catch (Exception ex) { s_logger.warn("Failed to implement network " + network + " elements and resources as a part of network restart due to ", ex); return false; } - setRestartRequired(network, false); - return true; } private void setRestartRequired(NetworkVO network, boolean restartRequired) {
