Fix #34844: allow "m" suffix in cpu limit of Docker

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java

@@ -167,4 +167,14 @@ protected String toJson(Object object) {
         }
     }
 
+    protected long getCpuQuota(Long cpuPeriod, String cpu) {
+        double converted;
+        if (cpu.endsWith("m")) {
+            converted = Double.parseDouble(cpu.substring(0, cpu.length() - 1)) / 1_000;
+        } else {
+            converted = Double.parseDouble(cpu);
+        }
+        return Double.valueOf(cpuPeriod.doubleValue() * converted).longValue();
+    }
+
 }

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java

@@ -122,13 +122,15 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
                 }
             }
             hostConfigBuilder.portBindings(dockerPortBindings);
-
             hostConfigBuilder.memoryReservation(memoryToBytes(spec.getMemoryRequest().getValueOrNull()));
             hostConfigBuilder.memory(memoryToBytes(spec.getMemoryLimit().getValueOrNull()));
+            if (spec.getCpuRequest().isPresent()) {
+                slog.warn(proxy, "Ignoring 'container-memory-request', this is not supported in Docker.");
+            }
             if (spec.getCpuLimit().isPresent()) {
                 // Workaround, see https://github.com/spotify/docker-client/issues/959
-                long period = 100000;
-                long quota = (long) (period * Float.parseFloat(spec.getCpuLimit().getValue()));
+                long period = 100_000;
+                long quota = getCpuQuota(period, spec.getCpuLimit().getValue());
                 hostConfigBuilder.cpuPeriod(period);
                 hostConfigBuilder.cpuQuota(quota);
             }

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java

@@ -149,7 +149,7 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
             // reservations are used by the Docker swarm scheduler
             if (spec.getCpuRequest().isPresent()) {
                 // note: 1 CPU = 1 * 10e8 nanoCpu -> equivalent to --cpus option
-                reservationsBuilder.nanoCpus((long) (Double.parseDouble(spec.getCpuRequest().getValue()) * 10e8));
+                reservationsBuilder.nanoCpus(getCpuQuota(1000_000_000L, spec.getCpuRequest().getValue()));
             }
             if (spec.getMemoryRequest().isPresent()) {
                 reservationsBuilder.memoryBytes(memoryToBytes(spec.getMemoryRequest().getValue()));
@@ -158,7 +158,7 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
             Resources.Builder limitsBuilder = Resources.builder();
             if (spec.getCpuLimit().isPresent()) {
                 // note: 1 CPU = 1 * 10e8 nanoCpu -> equivalent to --cpus option
-                limitsBuilder.nanoCpus((long) (Double.parseDouble(spec.getCpuLimit().getValue()) * 10e8));
+                limitsBuilder.nanoCpus(getCpuQuota(1000_000_000L, spec.getCpuLimit().getValue()));
             }
             if (spec.getMemoryLimit().isPresent()) {
                 limitsBuilder.memoryBytes(memoryToBytes(spec.getMemoryLimit().getValue()));

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnDocker.java

@@ -30,6 +30,9 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mandas.docker.client.DefaultDockerClient;
 import org.mandas.docker.client.DockerClient;
 import org.mandas.docker.client.builder.jersey.JerseyDockerClientBuilder;
@@ -55,11 +58,12 @@ public static void afterAll() {
         inst.close();
     }
 
-    @Test
-    public void testMemorySpecification() throws DockerCertificateException, DockerException, InterruptedException, InvalidParametersException {
+    @ValueSource(strings = {"01_hello_memory1", "01_hello_memory5"})
+    @ParameterizedTest
+    public void testMemoryAndCpuSpecification(String value) throws DockerCertificateException, DockerException, InterruptedException, InvalidParametersException {
         try (ContainerSetup containerSetup = new ContainerSetup("docker")) {
             try (DefaultDockerClient dockerClient = new JerseyDockerClientBuilder().fromEnv().build()) {
-                String id = inst.client.startProxy("01_hello_memory1");
+                String id = inst.client.startProxy(value);
                 Proxy proxy = inst.proxyService.getProxy(id);
 
                 List<Container> containers = dockerClient.listContainers(DockerClient.ListContainersParam.withStatusRunning(), DockerClient.ListContainersParam.withLabel("openanalytics.eu/sp-proxied-app"));
@@ -69,6 +73,8 @@ public void testMemorySpecification() throws DockerCertificateException, DockerE
                 ContainerInfo containerInfo = dockerClient.inspectContainer(container.id());
                 Assertions.assertEquals(268435456, containerInfo.hostConfig().memoryReservation());
                 Assertions.assertEquals(1073741824, containerInfo.hostConfig().memory());
+                Assertions.assertEquals(100_000, containerInfo.hostConfig().cpuPeriod());
+                Assertions.assertEquals(25_000, containerInfo.hostConfig().cpuQuota());
 
                 inst.proxyService.stopProxy(null, proxy, true).run();
             }

src/test/resources/application-test-docker.yml

@@ -46,6 +46,7 @@ proxy:
               port: 3838
           memory-request: 256Mi
           memory-limit: 1G
+          cpu-limit: 250m
     - id: 01_hello_memory2
       container-specs:
         - image: "openanalytics/shinyproxy-integration-test-app"
@@ -70,3 +71,13 @@ proxy:
             - name: default
               port: 3838
           memory-request: 0,5Gi
+    - id: 01_hello_memory5
+      container-specs:
+        - image: "openanalytics/shinyproxy-integration-test-app"
+          cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
+          port-mapping:
+            - name: default
+              port: 3838
+          memory-request: 256Mi
+          memory-limit: 1G
+          cpu-limit: 0.25