Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E359B200BAD for ; Tue, 25 Oct 2016 12:34:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E21B9160B02; Tue, 25 Oct 2016 10:34:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 34020160AE6 for ; Tue, 25 Oct 2016 12:34:15 +0200 (CEST) Received: (qmail 19082 invoked by uid 500); 25 Oct 2016 10:34:14 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 19064 invoked by uid 99); 25 Oct 2016 10:34:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2016 10:34:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 33008DFE80; Tue, 25 Oct 2016 10:34:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajani@apache.org To: commits@cloudstack.apache.org Date: Tue, 25 Oct 2016 10:34:14 -0000 Message-Id: <4f14c27c8a654a95b2c8c2d9f3a1c521@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: updated refs/heads/master to 99bb500 archived-at: Tue, 25 Oct 2016 10:34:16 -0000 Repository: cloudstack Updated Branches: refs/heads/master af8b223fd -> 99bb50072 Remove dangerous prototype of applyConfigToVR Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ddfc3681 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ddfc3681 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ddfc3681 Branch: refs/heads/master Commit: ddfc368117a3548cdf198d4f19f484365cf99aa8 Parents: 5d4b5fd Author: Aaron Brady Authored: Sat Mar 26 00:38:57 2016 +0000 Committer: Aaron Brady Committed: Sat Mar 26 00:39:04 2016 +0000 ---------------------------------------------------------------------- .../resource/virtualnetwork/VirtualRoutingResource.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ddfc3681/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index f271e72..2d22b14 100644 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -152,11 +152,10 @@ public class VirtualRoutingResource { } } - private ExecutionResult applyConfigToVR(String routerAccessIp, ConfigItem c) { - return applyConfigToVR(routerAccessIp, c, VRScripts.DEFAULT_EXECUTEINVR_TIMEOUT); - } - private ExecutionResult applyConfigToVR(String routerAccessIp, ConfigItem c, int timeout) { + if (timeout < VRScripts.DEFAULT_EXECUTEINVR_TIMEOUT) { + timeout = VRScripts.DEFAULT_EXECUTEINVR_TIMEOUT; + } if (c instanceof FileConfigItem) { FileConfigItem configItem = (FileConfigItem)c; return _vrDeployer.createFileInVR(routerAccessIp, configItem.getFilePath(), configItem.getFileName(), configItem.getFileContents()); @@ -180,7 +179,7 @@ public class VirtualRoutingResource { boolean finalResult = false; for (ConfigItem configItem : cfg) { long startTimestamp = System.currentTimeMillis(); - ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), configItem); + ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), configItem, VRScripts.DEFAULT_EXECUTEINVR_TIMEOUT); if (s_logger.isDebugEnabled()) { long elapsed = System.currentTimeMillis() - startTimestamp; s_logger.debug("Processing " + configItem + " took " + elapsed + "ms"); @@ -375,9 +374,6 @@ public class VirtualRoutingResource { ScriptConfigItem scriptConfigItem = new ScriptConfigItem(VRScripts.VR_CFG, "-c " + VRScripts.CONFIG_CACHE_LOCATION + cfgFileName); // 120s is the minimal timeout int timeout = answerCounts * _eachTimeout; - if (timeout < 120) { - timeout = 120; - } ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), fileConfigItem, timeout); if (!result.isSuccess()) {