From 2f6fc56e7436174c35b2a093fbba101b30f69fa6 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 7 Mar 2022 14:55:42 +0530 Subject: [PATCH] maven: Fix build on osx (#6056) kvm: don't read /proc/meminfo on non-Linux environments as part of constructor Co-authored-by: Nicolas Vazquez --- .../java/org/apache/cloudstack/utils/linux/MemStat.java | 4 +++- .../kvm/resource/LibvirtComputingResourceTest.java | 3 +++ .../java/org/apache/cloudstack/utils/linux/MemStatTest.java | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java index d62e1a24ce9..f89ae273aff 100644 --- a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java +++ b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java @@ -48,7 +48,9 @@ public class MemStat { public MemStat(long reservedMemory, long overCommitMemory) { this.reservedMemory = reservedMemory; this.overCommitMemory = overCommitMemory; - this.refresh(); + if (System.getProperty("os.name").equals("Linux")) { + this.refresh(); + } } public long getTotal() { diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index 1f654588179..8429a9ef9f6 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -5557,6 +5557,9 @@ public class LibvirtComputingResourceTest { @Test public void testMemoryFreeInKBsDomainReturningOfSomeMemoryStatistics() throws LibvirtException { + if (!System.getProperty("os.name").equals("Linux")) { + return; + } LibvirtComputingResource libvirtComputingResource = new LibvirtComputingResource(); MemoryStatistic[] mem = createMemoryStatisticFreeMemory100(); diff --git a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java index 50d4b006e13..57cb38111a4 100644 --- a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java +++ b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java @@ -46,6 +46,9 @@ public class MemStatTest { @Test public void getMemInfoParseTest() { MemStat memStat = new MemStat(); + if (!System.getProperty("os.name").equals("Linux")) { + return; + } Assert.assertEquals(memStat.getTotal(), 5970161664L); Assert.assertEquals(memStat.getAvailable(), 3164520448L); @@ -56,6 +59,9 @@ public class MemStatTest { @Test public void reservedMemoryTest() { MemStat memStat = new MemStat(1024, 2048); + if (!System.getProperty("os.name").equals("Linux")) { + return; + } Assert.assertEquals(memStat.getTotal(), 5970162688L); } }