diff --git a/VERSION b/VERSION index e5b5049..ab9884c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2019.08.05 +2019.08.07 diff --git a/container_shell/lib/dockage.py b/container_shell/lib/dockage.py index 33ada54..417eca3 100644 --- a/container_shell/lib/dockage.py +++ b/container_shell/lib/dockage.py @@ -166,7 +166,7 @@ def qos(qos_params, logger): qos_args['cpu_period'] = scheduler_period memory = _get_qos_value(qos_params, 'memory', 'string', logger) if memory: - qos_args['memory'] = memory + qos_args['mem_limit'] = memory device_read_iops = _get_qos_value(qos_params, 'device_read_iops', 'int', logger) if device_read_iops: qos_args['device_read_iops'] = [{'path': default_device, 'rate': device_read_iops}] diff --git a/tests/test_dockage.py b/tests/test_dockage.py index 5fc0d8e..36fe6aa 100644 --- a/tests/test_dockage.py +++ b/tests/test_dockage.py @@ -169,7 +169,7 @@ def test_memory(self): self.qos_params['memory'] = '15g' qos_args = dockage.qos(self.qos_params, self.fake_logger) - expected = {'memory': '15g'} + expected = {'mem_limit': '15g'} self.assertEqual(qos_args, expected)