diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2021-11-02 15:33:41 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2021-11-02 15:33:41 +0100 |
commit | 50383e769ed3d5ec2a588e5501bc1160e2194167 (patch) | |
tree | 0320d3010b73ad09e3f2b5a8a2d74ed061506aa9 /node-admin/src/test/java | |
parent | 076bac9ac7a6595b0b0b905e00576eff508d7fa9 (diff) |
Do not return empty CPU quota if unlimited
Diffstat (limited to 'node-admin/src/test/java')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV1Test.java | 2 | ||||
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV2Test.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV1Test.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV1Test.java index 02ee68a245b..f25001d77cd 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV1Test.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV1Test.java @@ -42,7 +42,7 @@ public class CGroupV1Test { UnixPath cpu = new UnixPath(fileSystem.getPath("/sys/fs/cgroup/cpu/machine.slice/libpod-4aec78cc.scope")).createDirectories(); cpu.resolve("cpu.cfs_period_us").writeUtf8File("123456\n"); cpu.resolve("cpu.cfs_quota_us").writeUtf8File("-1\n"); - assertEquals(Optional.empty(), cgroup.cpuQuotaPeriod(containerId)); + assertEquals(Optional.of(new Pair<>(-1, 123456)), cgroup.cpuQuotaPeriod(containerId)); cpu.resolve("cpu.cfs_quota_us").writeUtf8File("456\n"); assertEquals(Optional.of(new Pair<>(456, 123456)), cgroup.cpuQuotaPeriod(containerId)); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV2Test.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV2Test.java index 4bcd983133c..909979342ea 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV2Test.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/CGroupV2Test.java @@ -43,7 +43,7 @@ public class CGroupV2Test { assertEquals(Optional.empty(), cgroup.cpuQuotaPeriod(containerId)); cgroupRoot.resolve("cpu.max").writeUtf8File("max 100000\n"); - assertEquals(Optional.empty(), cgroup.cpuQuotaPeriod(containerId)); + assertEquals(Optional.of(new Pair<>(-1, 100000)), cgroup.cpuQuotaPeriod(containerId)); cgroupRoot.resolve("cpu.max").writeUtf8File("456 123456\n"); assertEquals(Optional.of(new Pair<>(456, 123456)), cgroup.cpuQuotaPeriod(containerId)); @@ -55,7 +55,7 @@ public class CGroupV2Test { assertEquals("654 123456", cgroupRoot.resolve("cpu.max").readUtf8File()); assertTrue(cgroup.updateCpuQuotaPeriod(context, containerId, -1, 123456)); - assertEquals(Optional.empty(), cgroup.cpuQuotaPeriod(containerId)); + assertEquals(Optional.of(new Pair<>(-1, 123456)), cgroup.cpuQuotaPeriod(containerId)); assertEquals("max 123456", cgroupRoot.resolve("cpu.max").readUtf8File()); } |