Updated Branches: refs/heads/4.2 2a182af4c -> 903d0c092
CLOUDSTACK-2823: This affects Ubuntu as well, since qemu version is 1.0.0 I don't think host kernel version has any bearing on it. Original code was tested with CentOS 6.3 and 6.4, but it seems to succeed or fail per-host, e.g. a fast host might work and a slow host might not. I was getting intermittent failures with ubuntu 12.04.3 prior to this patch. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/903d0c09 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/903d0c09 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/903d0c09 Branch: refs/heads/4.2 Commit: 903d0c09200bda6928ef189623b8250319888609 Parents: 2a182af Author: Marcus Sorensen <[email protected]> Authored: Wed Oct 16 00:25:04 2013 -0600 Committer: Marcus Sorensen <[email protected]> Committed: Wed Oct 16 00:25:04 2013 -0600 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/903d0c09/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 3223510..97aa597 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3567,7 +3567,7 @@ ServerResource { // pass cmdline info to system vms if (vmSpec.getType() != VirtualMachine.Type.User) { - if ((_kernelVersion < 2006034) && (conn.getVersion() < 1001000)) { // CLOUDSTACK-2823: try passCmdLine some times if kernel < 2.6.34 and qemu < 1.1.0 on hypervisor (for instance, CentOS 6.4) + if ((conn.getVersion() < 1001000)) { // CLOUDSTACK-2823: try passCmdLine some times if kernel < 2.6.34 and qemu < 1.1.0 on hypervisor (for instance, CentOS 6.4) //wait for 5 minutes at most String controlIp = null; for (NicTO nic : nics) {
