contained_mr 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 440ccef564b310bd2bc7752380b7d97861ab2020
-  data.tar.gz: 15f09bb85ba6e21447b38b26d0790b09342d3f01
+  metadata.gz: cb47353419e6a56f1246d06934b63c123edfb442
+  data.tar.gz: 594990cbb031cd9e9298832c0374b2d76e81196d
 SHA512:
-  metadata.gz: 814c12447b2d338a6781cc81419117b189c19598f9dc942f0f8264dd05dfbd4d4cab297ee029a6efe9808cb5b5366cdb0968c6617ba9165eda169c76f2cc0b24
-  data.tar.gz: e4b768cb0013ea3dc9b8f9817481eda342c87d966cb4dfcc206f175a5112826960d1c540e53ceaf1729f401e67c3ffb3dab38857e66ff7acda747f36c1f34c61
+  metadata.gz: b0bd1266cfdbaf5d1b24757d8bf52e37a0780b5912d78bf987c1f0b50247874709a832ad7aaec06649d7b8b80ca48c58f301bed0d91ea9632041d20ec697ca9b
+  data.tar.gz: 2925db33e8bb0179a80b7e93968c6728139d1b4735dc86918fd30d72a50f8355b3ba8d372357cfab01d2f16bb5ce15f77fffff4bf4cc8c5487fb7eb7c4f9d86f

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/contained_mr.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: contained_mr 0.3.2 ruby lib
+# stub: contained_mr 0.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "contained_mr"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/contained_mr/job_logic.rb

@@ -109,8 +109,8 @@ module ContainedMr::JobLogic
 
     {
       'Memory' => ram_bytes, 'MemorySwap' => swap_bytes,
-      'CpuShares' => (job_section[:vcpus] * cpu_period).to_i,
-      'CpuPeriod' => cpu_period
+      'CpuPeriod' => cpu_period,
+      'CpuQuota' => (job_section[:vcpus] * cpu_period).to_i,
     }
   end
   private :container_host_config

data/lib/contained_mr/mock/runner.rb

@@ -112,8 +112,8 @@ class ContainedMr::Mock::Runner
   def _vcpus
     return nil unless host_config = @_container_options['HostConfig']
     return nil unless period = host_config['CpuPeriod']
-    return nil unless shares = host_config['CpuShares']
+    return nil unless quota = host_config['CpuQuota']
 
-    shares / period.to_f
+    quota / period.to_f
   end
 end

data/test/test_job_logic.rb

@@ -40,7 +40,7 @@ class TestJobLogic < MiniTest::Test
       'HostConfig' => {
         'Memory' => 256.5 * 1024 * 1024,
         'MemorySwap' => (256.5 + 64) * 1024 * 1024,
-        'CpuShares' => 1500000,
+        'CpuQuota' => 1500000,
         'CpuPeriod' => 1000000,
       },
     }
@@ -63,7 +63,7 @@ class TestJobLogic < MiniTest::Test
       'HostConfig' => {
         'Memory' => 768.5 * 1024 * 1024,
         'MemorySwap' => -1,
-        'CpuShares' => 500000,
+        'CpuQuota' => 500000,
         'CpuPeriod' => 1000000,
       },
     }

data/test/test_mock_runner.rb

@@ -17,7 +17,7 @@ class TestMockRunner < MiniTest::Test
       'HostConfig' => {
         'Memory' => 256.5 * 1024 * 1024,
         'MemorySwap' => (256.5 + 64) * 1024 * 1024,
-        'CpuShares' => 1500000,
+        'CpuQuota' => 1500000,
         'CpuPeriod' => 1000000,
       },
     }
@@ -137,7 +137,7 @@ class TestMockRunner < MiniTest::Test
   end
 
   def test_memory_cpu_limits_without_host_config_cpu_shares
-    @container_options['HostConfig'].delete 'CpuShares'
+    @container_options['HostConfig'].delete 'CpuQuota'
     runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
                                            '/usr/mrd/map-output'
     assert_equal 256.5, runner._ram_limit

data/test/test_runner_logic.rb

@@ -16,7 +16,7 @@ class TestRunnerLogic < MiniTest::Test
       'HostConfig' => {
         'Memory' => 256.5 * 1024 * 1024,
         'MemorySwap' => (256.5 + 64) * 1024 * 1024,
-        'CpuShares' => 1500000,
+        'CpuQuota' => 1500000,
         'CpuPeriod' => 1000000,
       },
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contained_mr
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Victor Costan