feat(Container): block devices io limits

Docker/Container.php

@@ -393,13 +393,25 @@ public function getRunCommand($containerId)
             $labels .= ' --label ' . escapeshellarg($label);
         }
 
+        $process = new \Symfony\Component\Process\Process("lsblk --nodeps --output NAME --noheadings 2>/dev/null");
+        $process->mustRun();
+        $devices = array_filter(explode("\n", $process->getOutput()), function ($device) {
+            return !empty($device);
+        });
+        $deviceLimits = "";
+        foreach ($devices as $device) {
+            $deviceLimits .= " --device-write-bps /dev/{$device}:{$this->limits->getDeviceIOLimits($this->getImage())}";
+            $deviceLimits .= " --device-read-bps /dev/{$device}:{$this->limits->getDeviceIOLimits($this->getImage())}";
+        }
+
         $command .= " --volume " . escapeshellarg($this->dataDir . ":/data")
             . " --volume " . escapeshellarg($this->tmpDir . ":/tmp")
             . " --memory " . escapeshellarg($this->limits->getMemoryLimit($this->getImage()))
             . " --memory-swap " . escapeshellarg($this->limits->getMemorySwapLimit($this->getImage()))
             . " --cpu-shares " . escapeshellarg($this->limits->getCpuSharesLimit($this->getImage()))
             . " --net " . escapeshellarg($this->limits->getNetworkLimit($this->getImage()))
             . " --cpus " . escapeshellarg($this->limits->getCpuLimit($this->getImage()))
+            . $deviceLimits
             . $envs
             . $labels
             . " --name " . escapeshellarg($containerId)

Docker/Runner/Limits.php

@@ -96,6 +96,11 @@ public function getCpuLimit(Image $image)
         return min($instance, $project);
     }
 
+    public function getDeviceIOLimits(Image $image)
+    {
+        return '50m';
+    }
+
     /**
      * @return Range[]
      */

Tests/Docker/ContainerTest.php

@@ -154,6 +154,19 @@ public function testRunCommand()
             new OutputFilter(),
             new Limits($log, ['cpu_count' => 2], [], [], [])
         );
+
+        // block devices
+        $process = new \Symfony\Component\Process\Process("lsblk --nodeps --output NAME --noheadings 2>/dev/null");
+        $process->mustRun();
+        $devices = array_filter(explode("\n", $process->getOutput()), function ($device) {
+            return !empty($device);
+        });
+        $deviceLimits = "";
+        foreach ($devices as $device) {
+            $deviceLimits .= " --device-write-bps /dev/{$device}:50m";
+            $deviceLimits .= " --device-read-bps /dev/{$device}:50m";
+        }
+
         $expected = "sudo timeout --signal=SIGKILL 3600"
             . " docker run"
             . " --volume '/data:/data'"
@@ -163,6 +176,7 @@ public function testRunCommand()
             . " --cpu-shares '1024'"
             . " --net 'bridge'"
             . " --cpus '2'"
+            . $deviceLimits
             . " --env \"var=val\""
             . " --env \"příliš=žluťoučký\""
             . " --env \"var2=weird = '\\\"value\""

Tests/Runner/LimitsTest.php

@@ -24,19 +24,9 @@ public function testInstanceLimitsInvalid()
             [],
             []
         );
-        $componentMock = self::getMockBuilder(Component::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $image = self::getMockBuilder(AWSElasticContainerRegistry::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getSourceComponent'])
-            ->getMock();
-        $image->method('getSourceComponent')
-            ->will(self::returnValue($componentMock));
-        /** @var Image $image */
         self::expectException(ApplicationException::class);
         self::expectExceptionMessage('cpu_count is set incorrectly in parameters.yml: This value should be a valid number.');
-        $limits->getCpuLimit($image);
+        $limits->getCpuLimit($this->getImageMock());
     }
 
     public function testProjectLimitsInvalid()
@@ -50,19 +40,9 @@ public function testProjectLimitsInvalid()
             [],
             []
         );
-        $componentMock = self::getMockBuilder(Component::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $image = self::getMockBuilder(AWSElasticContainerRegistry::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getSourceComponent'])
-            ->getMock();
-        $image->method('getSourceComponent')
-            ->will(self::returnValue($componentMock));
-        /** @var Image $image */
         self::expectException(ApplicationException::class);
         self::expectExceptionMessage('runner.cpuParallelism limit is set incorrectly: This value should be 96 or less.');
-        $limits->getCpuLimit($image);
+        $limits->getCpuLimit($this->getImageMock());
     }
 
     public function testLimitsInstance()
@@ -76,17 +56,7 @@ public function testLimitsInstance()
             ['foo', 'bar'],
             ['bar', 'kochba']
         );
-        $componentMock = self::getMockBuilder(Component::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $image = self::getMockBuilder(AWSElasticContainerRegistry::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getSourceComponent'])
-            ->getMock();
-        $image->method('getSourceComponent')
-            ->will(self::returnValue($componentMock));
-        /** @var Image $image */
-        self::assertEquals(1, $limits->getCpuLimit($image));
+        self::assertEquals(1, $limits->getCpuLimit($this->getImageMock()));
         self::assertContains('CPU limits - instance: 1 project: 2', $handler->getRecords()[0]['message']);
     }
 
@@ -99,17 +69,7 @@ public function testLimitsDefault()
             [],
             []
         );
-        $componentMock = self::getMockBuilder(Component::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $image = self::getMockBuilder(AWSElasticContainerRegistry::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getSourceComponent'])
-            ->getMock();
-        $image->method('getSourceComponent')
-            ->will(self::returnValue($componentMock));
-        /** @var Image $image */
-        self::assertEquals(2, $limits->getCpuLimit($image));
+        self::assertEquals(2, $limits->getCpuLimit($this->getImageMock()));
     }
 
     public function testLimitsProject()
@@ -121,17 +81,7 @@ public function testLimitsProject()
             [],
             []
         );
-        $componentMock = self::getMockBuilder(Component::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $image = self::getMockBuilder(AWSElasticContainerRegistry::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getSourceComponent'])
-            ->getMock();
-        $image->method('getSourceComponent')
-            ->will(self::returnValue($componentMock));
-        /** @var Image $image */
-        self::assertEquals(10, $limits->getCpuLimit($image));
+        self::assertEquals(10, $limits->getCpuLimit($this->getImageMock()));
     }
 
     public function testLimitsProjectInstance()
@@ -143,6 +93,26 @@ public function testLimitsProjectInstance()
             [],
             []
         );
+        self::assertEquals(2, $limits->getCpuLimit($this->getImageMock()));
+    }
+
+    public function testDeviceIOLimits()
+    {
+        $limits = new Limits(
+            new NullLogger(),
+            [],
+            [],
+            [],
+            []
+        );
+        self::assertEquals("50m", $limits->getDeviceIOLimits($this->getImageMock()));
+    }
+
+    /**
+     * @return Image
+     */
+    private function getImageMock()
+    {
         $componentMock = self::getMockBuilder(Component::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -152,7 +122,6 @@ public function testLimitsProjectInstance()
             ->getMock();
         $image->method('getSourceComponent')
             ->will(self::returnValue($componentMock));
-        /** @var Image $image */
-        self::assertEquals(2, $limits->getCpuLimit($image));
+        return $image;
     }
 }