Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0642a698 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0642a698 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0642a698 Branch: refs/heads/master Commit: 0642a6982fe9ab1811b2496fcd3cfe0dc3b0ef55 Parents: 15fd571 55b9180 Author: Rohit Yadav <[email protected]> Authored: Wed Nov 23 14:22:15 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Wed Nov 23 14:22:15 2016 +0530 ---------------------------------------------------------------------- .../resource/virtualnetwork/VRScripts.java | 5 ++++- .../virtualnetwork/VirtualRouterDeployer.java | 5 +++-- .../virtualnetwork/VirtualRoutingResource.java | 21 ++++++++++++-------- .../VirtualRoutingResourceTest.java | 5 +++-- .../resource/HypervDirectConnectResource.java | 9 +++++---- .../kvm/resource/LibvirtComputingResource.java | 13 ++++++------ .../LibvirtOvsCreateTunnelCommandWrapper.java | 12 ++++------- .../LibvirtPvlanSetupCommandWrapper.java | 5 +++-- .../resource/LibvirtComputingResourceTest.java | 20 +++++++++---------- .../resources/Ovm3VirtualRoutingResource.java | 8 +++++--- .../vmware/resource/VmwareResource.java | 8 +++++--- .../xenserver/resource/CitrixResourceBase.java | 8 +++++--- .../java/com/cloud/utils/script/Script.java | 18 ++++++++++++++++- .../java/com/cloud/utils/ssh/SshHelper.java | 9 +++++++-- 14 files changed, 90 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0642a698/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java ---------------------------------------------------------------------- diff --cc core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 2d22b14,87a38d3..7ec7d27 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@@ -179,7 -181,7 +181,7 @@@ public class VirtualRoutingResource boolean finalResult = false; for (ConfigItem configItem : cfg) { long startTimestamp = System.currentTimeMillis(); - ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), configItem, VRScripts.DEFAULT_EXECUTEINVR_TIMEOUT); - ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), configItem); ++ ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), configItem, VRScripts.VR_SCRIPT_EXEC_TIMEOUT); if (s_logger.isDebugEnabled()) { long elapsed = System.currentTimeMillis() - startTimestamp; s_logger.debug("Processing " + configItem + " took " + elapsed + "ms"); @@@ -373,9 -375,12 +375,12 @@@ FileConfigItem fileConfigItem = new FileConfigItem(VRScripts.CONFIG_CACHE_LOCATION, cfgFileName, sb.toString()); ScriptConfigItem scriptConfigItem = new ScriptConfigItem(VRScripts.VR_CFG, "-c " + VRScripts.CONFIG_CACHE_LOCATION + cfgFileName); // 120s is the minimal timeout - int timeout = answerCounts * _eachTimeout; + Duration timeout = _eachTimeout.withDurationAdded(_eachTimeout.getStandardSeconds(), answerCounts); + if (timeout.isShorterThan(VRScripts.VR_SCRIPT_EXEC_TIMEOUT)) { + timeout = VRScripts.VR_SCRIPT_EXEC_TIMEOUT; + } - ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), fileConfigItem); + ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), fileConfigItem, timeout); if (!result.isSuccess()) { return new Answer(cmd, false, result.getDetails()); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0642a698/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0642a698/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0642a698/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --cc plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index 0624947,2865e56..1ebe515 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@@ -108,48 -154,6 +109,49 @@@ import com.xensource.xenapi.VIF import com.xensource.xenapi.VLAN; import com.xensource.xenapi.VM; import com.xensource.xenapi.XenAPIObject; +import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; +import org.apache.commons.io.FileUtils; +import org.apache.log4j.Logger; +import org.apache.xmlrpc.XmlRpcException; ++import org.joda.time.Duration; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +import javax.naming.ConfigurationException; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLConnection; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; +import java.util.Queue; +import java.util.Random; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.TimeoutException; /** * CitrixResourceBase encapsulates the calls to the XenServer Xapi process to
