cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/4.1 to 706e236
Date Thu, 08 Aug 2013 15:07:24 GMT
Updated Branches:
  refs/heads/4.1 630d2561d -> 706e23623


Add cpu model for kvm guest.Now all the kvm guest's cpu model is 'QEMU Virtual CPU version
xxx'. This will affect the activation of Windows OS and low performance. I add three mode
for user to indicate the guest cpu model.add libvirt version check

Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
(cherry picked from commit 2903bb5fd9d59803980102854d11e33ebe56088b)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/706e2362
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/706e2362
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/706e2362

Branch: refs/heads/4.1
Commit: 706e23623c3227d92ae498529166ca73d2a2bf4e
Parents: 630d256
Author: JijunLiu <jijunlx@gmail.com>
Authored: Sun Jul 14 11:21:39 2013 +0800
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Thu Aug 8 17:06:39 2013 +0200

----------------------------------------------------------------------
 agent/conf/agent.properties                     | 21 +++++++++++++++
 .../kvm/resource/LibvirtComputingResource.java  | 27 ++++++++++++++++++++
 .../hypervisor/kvm/resource/LibvirtVMDef.java   | 27 ++++++++++++++++++++
 .../kvm/resource/LibvirtVMDefTest.java          | 21 +++++++++++++++
 4 files changed, 96 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/706e2362/agent/conf/agent.properties
----------------------------------------------------------------------
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 724bd72..5b72789 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -80,3 +80,24 @@ domr.scripts.dir=scripts/network/domr/kvm
 # native = com.cloud.hypervisor.kvm.resource.BridgeVifDriver
 # openvswitch = com.cloud.hypervisor.kvm.resource.OvsVifDriver
 #libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.BridgeVifDriver
+
+# setting to enable the cpu model to kvm guest globally.
+# three option:custom,host-model and host-passthrough.
+# custom - user custom the CPU model which specified by guest.cpu.model.
+# host-model - identify the named CPU model which most closely matches the host,
+# and then request additional CPU flags to complete the match. This should give
+# close to maximum functionality/performance, which maintaining good
+# reliability/compatibility if the guest is migrated to another host with slightly different
host CPUs.
+# host-passthrough - tell KVM to passthrough the host CPU with no modifications.
+# The difference to host-model, instead of just matching feature flags,
+# every last detail of the host CPU is matched. This gives absolutely best performance,
+# and can be important to some apps which check low level CPU details,
+# but it comes at a cost wrt migration. The guest can only be migrated to
+# an exactly matching host CPU.
+#
+# guest.cpu.mode=custom|host-model|host-passthrough
+# This param is only valid if guest.cpu.mode=custom,
+# for examples:"Conroe" "Penryn", "Nehalem", "Westmere", "pentiumpro" and so
+# on,run virsh capabilities for more details.
+# guest.cpu.model=
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/706e2362/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 4728a25..9bb5021 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
@@ -174,6 +174,7 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.kvm.resource.KVMHABase.NfsStoragePool;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.ClockDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.ConsoleDef;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuModeDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuTuneDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DevicesDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
@@ -332,6 +333,8 @@ ServerResource {
     private boolean _can_bridge_firewall;
     protected String _localStoragePath;
     protected String _localStorageUUID;
+    protected String _guestCpuMode;
+    protected String _guestCpuModel;
     private final Map <String, String> _pifs = new HashMap<String, String>();
     private final Map<String, Map<String, String>> hostNetInfo = new HashMap<String,
Map<String, String>>();
     private final Map<String, vmStats> _vmStats = new ConcurrentHashMap<String,
vmStats>();
@@ -692,6 +695,18 @@ ServerResource {
 
         }
 
+        _guestCpuMode = (String) params.get("guest.cpu.mode");
+        if (_guestCpuMode != null) {
+            _guestCpuModel = (String) params.get("guest.cpu.model");
+
+            if(_hypervisorLibvirtVersion < (9 * 1000 + 10)) {
+                s_logger.warn("LibVirt version 0.9.10 required for guest cpu mode, but version
" +
+                        prettyVersion(_hypervisorLibvirtVersion) + " detected, so it will
be disabled");
+                _guestCpuMode = null;
+                _guestCpuModel = null;
+            }
+        }
+
         String[] info = NetUtils.getNetworkParams(_privateNic);
 
         _monitor = new KVMHAMonitor(null, info[0], _heartBeatPath);
@@ -3043,6 +3058,11 @@ ServerResource {
         grd.setVcpuNum(vmTO.getCpus());
         vm.addComp(grd);
 
+        CpuModeDef cmd = new CpuModeDef();
+        cmd.setMode(_guestCpuMode);
+        cmd.setModel(_guestCpuModel);
+        vm.addComp(cmd);
+
         CpuTuneDef ctd = new CpuTuneDef();
         ctd.setShares(vmTO.getCpus() * vmTO.getSpeed());
         vm.addComp(ctd);
@@ -4671,6 +4691,13 @@ ServerResource {
         return new Answer(cmd, success, "");
     }
 
+    private String prettyVersion(long version) {
+        long major = version / 1000000;
+        long minor = version % 1000000 / 1000;
+        long release = version % 1000000 % 1000;
+        return major + "."  + minor + "." + release;
+    }
+
 	@Override
 	public void setName(String name) {
 		// TODO Auto-generated method stub

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/706e2362/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 7b26cfe..0f4567c 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -833,6 +833,33 @@ public class LibvirtVMDef {
         }
     }
 
+    public static class CpuModeDef {
+        private String _mode;
+        private String _model;
+
+        public void setMode(String mode) {
+            _mode = mode;
+        }
+
+        public void setModel(String model) {
+            _model = model;
+        }
+
+        @Override
+        public String toString() {
+            StringBuilder modeBuidler = new StringBuilder();
+            if ("custom".equalsIgnoreCase(_mode) && _model != null) {
+                modeBuidler.append("<cpu mode='custom' match='exact'><model fallback='allow'>"
+                            + _model + "</model></cpu>");
+            } else if ("host-model".equals(_mode)) {
+                modeBuidler.append("<cpu mode='host-model'><model fallback='allow'></model></cpu>");
+            } else if ("host-passthrough".equals(_mode)) {
+                modeBuidler.append("<cpu mode='host-passthrough'></cpu>");
+            }
+            return modeBuidler.toString();
+        }
+    }
+
     public static class SerialDef {
         private final String _type;
         private final String _source;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/706e2362/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java
b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java
index b723875..3afe598 100644
--- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java
+++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java
@@ -35,4 +35,25 @@ public class LibvirtVMDefTest extends TestCase {
 
         assertEquals(expected, ifDef.toString());
     }
+
+    public void testCpuModeDef(){
+        LibvirtVMDef.CpuModeDef cpuModeDef = new LibvirtVMDef.CpuModeDef();
+        cpuModeDef.setMode("custom");
+        cpuModeDef.setModel("Nehalem");
+
+        String expected1 = "<cpu mode='custom' match='exact'><model fallback='allow'>Nehalem</model></cpu>";
+
+        assertEquals(expected1, cpuModeDef.toString());
+
+        cpuModeDef.setMode("host-model");
+        String expected2 = "<cpu mode='host-model'><model fallback='allow'></model></cpu>";
+
+        assertEquals(expected2, cpuModeDef.toString());
+
+        cpuModeDef.setMode("host-passthrough");
+        String expected3 = "<cpu mode='host-passthrough'></cpu>";
+        assertEquals(expected3, cpuModeDef.toString());
+
+    }
+
 }


Mime
View raw message