You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/07/15 10:55:27 UTC
git commit: updated refs/heads/4.2 to 564c30a
Updated Branches:
refs/heads/4.2 6e85ae219 -> 564c30a04
CLOUDSTACK-2823: move kernelVersion to global configuration in LibvirtComputingResource.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/564c30a0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/564c30a0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/564c30a0
Branch: refs/heads/4.2
Commit: 564c30a0407886fea865ae93c67ed4cf00e2fdd8
Parents: 6e85ae2
Author: Wei Zhou <w....@leaseweb.com>
Authored: Mon Jul 15 10:54:38 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Mon Jul 15 10:55:17 2013 +0200
----------------------------------------------------------------------
.../hypervisor/kvm/resource/LibvirtComputingResource.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/564c30a0/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 a2e4044..85a8fa0 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
@@ -289,6 +289,7 @@ ServerResource {
private int _migrateSpeed;
private long _hvVersion;
+ private long _kernelVersion;
private KVMHAMonitor _monitor;
private final String _SSHKEYSPATH = "/root/.ssh";
private final String _SSHPRVKEYPATH = _SSHKEYSPATH + File.separator
@@ -846,6 +847,10 @@ ServerResource {
storageProcessor.configure(name, params);
storageHandler = new StorageSubsystemCommandHandlerBase(storageProcessor);
+ String unameKernelVersion = Script.runSimpleBashScript("uname -r");
+ String[] kernelVersions = unameKernelVersion.split("[\\.\\-]");
+ _kernelVersion = Integer.parseInt(kernelVersions[0]) * 1000 * 1000 + Integer.parseInt(kernelVersions[1]) * 1000 + Integer.parseInt(kernelVersions[2]);
+
return true;
}
@@ -3312,10 +3317,7 @@ ServerResource {
// pass cmdline info to system vms
if (vmSpec.getType() != VirtualMachine.Type.User) {
- String unameKernelVersion = Script.runSimpleBashScript("uname -r");
- String[] kernelVersions = unameKernelVersion.split("[\\.\\-]");
- long kernelVersion = Integer.parseInt(kernelVersions[0]) * 1000 * 1000 + Integer.parseInt(kernelVersions[1]) * 1000 + Integer.parseInt(kernelVersions[2]);
- 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 ((_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)
for (int count = 0; count < 10; count ++) {
passCmdLine(vmName, vmSpec.getBootArgs());
try {