You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/05/13 21:02:38 UTC
[1/3] git commit: updated refs/heads/master to 7be8585
Repository: cloudstack
Updated Branches:
refs/heads/master c82d50270 -> 7be858578
CPU socket count reporting correction
CPU socket count reporting correction
>From https://github.com/MissionCriticalCloud/cosmic-plugin-hypervisor-kvm/pull/16
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/42de1f81
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/42de1f81
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/42de1f81
Branch: refs/heads/master
Commit: 42de1f81ed13145374a5838459ce068881966e8c
Parents: 419f8fb
Author: NuxRo <nu...@li.nux.ro>
Authored: Wed Apr 27 10:49:53 2016 +0100
Committer: NuxRo <nu...@li.nux.ro>
Committed: Wed Apr 27 10:49:53 2016 +0100
----------------------------------------------------------------------
.../hypervisor/kvm/resource/LibvirtComputingResource.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/42de1f81/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 883c8c9..a15071e 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
@@ -2625,8 +2625,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
final Connect conn = LibvirtConnection.getConnection();
final NodeInfo hosts = conn.nodeInfo();
speed = getCpuSpeed(hosts);
-
+
+ /*
+ * Some CPUs report a single socket and multiple NUMA cells.
+ * We need to multiply them to get the correct socket count.
+ */
cpuSockets = hosts.sockets;
+ if (hosts.nodes > 0) {
+ cpuSockets = hosts.sockets * hosts.nodes;
+ }
cpus = hosts.cpus;
ram = hosts.memory * 1024L;
final LibvirtCapXMLParser parser = new LibvirtCapXMLParser();
[3/3] git commit: updated refs/heads/master to 7be8585
Posted by sw...@apache.org.
Merge pull request #1520 from NuxRo/kvm-numa-cpu-reporting
CPU socket count reporting correctionCPU socket count reporting correction
>From https://github.com/MissionCriticalCloud/cosmic-plugin-hypervisor-kvm/pull/16
* pr/1520:
Remove empty spaces causing the build to fail
CPU socket count reporting correction
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7be85857
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7be85857
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7be85857
Branch: refs/heads/master
Commit: 7be8585787ac9600a1276222da6780dd7da9f26f
Parents: c82d502 108b351
Author: Will Stevens <wi...@gmail.com>
Authored: Fri May 13 17:02:09 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Fri May 13 17:02:10 2016 -0400
----------------------------------------------------------------------
.../hypervisor/kvm/resource/LibvirtComputingResource.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7be85857/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --cc plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 0f8e9ed,d8826d9..17b3fd5
mode 100644,100755..100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
[2/3] git commit: updated refs/heads/master to 7be8585
Posted by sw...@apache.org.
Remove empty spaces causing the build to fail
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/108b3517
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/108b3517
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/108b3517
Branch: refs/heads/master
Commit: 108b3517afc8a5bd5cb1443fb7dc88a8c71ef168
Parents: 42de1f8
Author: NuxRo <nu...@li.nux.ro>
Authored: Wed Apr 27 19:15:02 2016 +0100
Committer: NuxRo <nu...@li.nux.ro>
Committed: Wed Apr 27 19:15:02 2016 +0100
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/108b3517/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 a15071e..d8826d9 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
@@ -2625,7 +2625,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
final Connect conn = LibvirtConnection.getConnection();
final NodeInfo hosts = conn.nodeInfo();
speed = getCpuSpeed(hosts);
-
+
/*
* Some CPUs report a single socket and multiple NUMA cells.
* We need to multiply them to get the correct socket count.