contained_mr 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddef939463b55a174ccb6f44f90ad8f28f9f8bdc
-  data.tar.gz: b80c4c9a95e03b2fc61bd378f1e405a26a633513
+  metadata.gz: 7a671efb4fb8421ddf841a9eeabb64b5612bf930
+  data.tar.gz: 304aff98010a52db78225a845406f0cb19bd0651
 SHA512:
-  metadata.gz: 195e87944d7a7d3d447d7526ee58459c091381a5c7c25f78ac7c1768fc9857f1f3106f8b011554f3d232e6b7dd36f47a24cf402bc861912751d3abfc2317f79a
-  data.tar.gz: e19354cfca2219c5d2765e268a2d8a93ffd243168b50bd46b87e8b023cfc976d74f52631926daa917f33a4674b9be75d254be1f745f2f900084bd9a1a9570b95
+  metadata.gz: d558c08cce053336b116dda4a270c8d391de24d1b1d7ddecaf4c7761b0cb5ac227dbc7952f268c9b6a1448fd935290510d6e34ff061e09d203b2758fb0b14f0f
+  data.tar.gz: 388ef7ed32cf7506b732cabe66b8f38b869014f89d2b6916e6fc955133c953d6811cbce86daba9fc037746af68063c3fa96738ff6c8dd5eb5fcd9993fd37e8fd

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

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.0 ruby lib
+# stub: contained_mr 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "contained_mr"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/contained_mr/mock/runner.rb

@@ -83,4 +83,37 @@ class ContainedMr::Mock::Runner
     end
     nil
   end
+
+  # Convenience method for looking up the RAM limit in the container options.
+  #
+  # @return {Number} the container's RAM limit, in megabytes
+  def _ram_limit
+    return nil unless host_config = @_container_options['HostConfig']
+    return nil unless memory = host_config['Memory']
+    memory / (1024 * 1024).to_f
+  end
+
+  # Convenience method for looking up the swap limit in the container options.
+  #
+  # @return {Number} the container's swap limit, in megabytes
+  def _swap_limit
+    return nil unless host_config = @_container_options['HostConfig']
+    return nil unless memory = host_config['Memory']
+    return nil unless memory_swap = host_config['MemorySwap']
+
+    return 0 if memory_swap == -1
+    (memory_swap - memory) / (1024 * 1024).to_f
+  end
+
+  # Convenience method for looking up CPU allocation in the container options.
+  #
+  # @return {Number} the number of CPU cores allocated to the container; this
+  #   can be a fraction
+  def _vcpus
+    return nil unless host_config = @_container_options['HostConfig']
+    return nil unless period = host_config['CpuPeriod']
+    return nil unless shares = host_config['CpuShares']
+
+    shares / period.to_f
+  end
 end

data/test/test_mock_runner.rb

@@ -102,4 +102,64 @@ class TestMockRunner < MiniTest::Test
     assert_equal nil, runner._ulimit('cpu')
     assert_equal nil, runner._ulimit('rss')
   end
+
+  def test_memory_cpu_limits
+    assert_equal 256.5, @runner._ram_limit
+    assert_equal 64, @runner._swap_limit
+    assert_equal 1.5, @runner._vcpus
+  end
+
+  def test_memory_cpu_limits_without_host_config
+    @container_options.delete 'HostConfig'
+    runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                           '/usr/mrd/map-output'
+    assert_equal nil, runner._ram_limit
+    assert_equal nil, runner._swap_limit
+    assert_equal nil, runner._vcpus
+  end
+
+  def test_memory_cpu_limits_without_host_config_memory
+    @container_options['HostConfig'].delete 'Memory'
+    runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                           '/usr/mrd/map-output'
+    assert_equal nil, runner._ram_limit
+    assert_equal nil, runner._swap_limit
+    assert_equal 1.5, runner._vcpus
+  end
+
+  def test_memory_cpu_limits_without_host_config_memory_swap
+    @container_options['HostConfig'].delete 'MemorySwap'
+    runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                           '/usr/mrd/map-output'
+    assert_equal 256.5, runner._ram_limit
+    assert_equal nil, runner._swap_limit
+    assert_equal 1.5, runner._vcpus
+  end
+
+  def test_memory_cpu_limits_without_host_config_cpu_shares
+    @container_options['HostConfig'].delete 'CpuShares'
+    runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                           '/usr/mrd/map-output'
+    assert_equal 256.5, runner._ram_limit
+    assert_equal 64, runner._swap_limit
+    assert_equal nil, runner._vcpus
+  end
+
+  def test_memory_cpu_limits_without_host_config_cpu_period
+    @container_options['HostConfig'].delete 'CpuPeriod'
+    runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                           '/usr/mrd/map-output'
+    assert_equal 256.5, runner._ram_limit
+    assert_equal 64, runner._swap_limit
+    assert_equal nil, runner._vcpus
+  end
+
+  def test_memory_limits_without_swap
+    @container_options['HostConfig']['MemorySwap'] = -1
+    runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                           '/usr/mrd/map-output'
+    assert_equal 256.5, runner._ram_limit
+    assert_equal 0, runner._swap_limit
+    assert_equal 1.5, runner._vcpus
+  end
 end

metadata

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