contained_mr 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c256acd59c0cb4cafca0aa814733eba82b076b06
-  data.tar.gz: 86164b32282388fa75d53310f62437082e32d801
+  metadata.gz: 63dd405ddd7f6926540118a53fae49b4e68eae85
+  data.tar.gz: 5f60e7e07994d45710b7c1a11149a36e641e6e97
 SHA512:
-  metadata.gz: 3b4e879f960930faf614cff7398e380eb52fe0e2fafc254e2fa7e2fc6832b3746fa61425ed72fcd782fdee9b3d2d58bd439f3b0a056861f404b0b5daba0b32b7
-  data.tar.gz: dfd206cfcf2ddc73b3747659131363cf787dfda94444b45a62235629dcad23e404beed38609acefdaafab7e23f36237007bf2e7828580dad890428cd25638b45
+  metadata.gz: 786419170b2c4b3d2b35d80f3897ace4503f1757e0fe3682a62fcca65d1e1de46f7c2fe721885dec65ea06c7e79ec62d4a70a352812ce9008215ee8ce735b81c
+  data.tar.gz: 272b5127d2bb5efec7595086b299fb25458523d37d93828b696e2565ae802d9809224be0fd489e1627c92183439d9fd6ed52de0acc27fb2ac9d7b5bed6a6c943

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

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.1.1 ruby lib
+# stub: contained_mr 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "contained_mr"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/contained_mr/runner.rb",
     "lib/contained_mr/template.rb",
     "test/helper.rb",
+    "test/test_cleaner.rb",
     "test/test_job.rb",
     "test/test_runner.rb",
     "test/test_template.rb",

data/lib/contained_mr/cleaner.rb

@@ -32,9 +32,13 @@ class ContainedMr::Cleaner
     tag_prefix = "#{@name_prefix}/"
     images = Docker::Image.all
     images.each do |image|
-      image_tags = image.info['RepoTags'] || []
-      next unless image_tags.any? { |tag| tag.start_with? tag_prefix }
-      image.delete
+      next unless image_tags = image.info['RepoTags']
+      image_tags.each do |image_tag|
+        next unless image_tag.start_with? tag_prefix
+        # HACK(pwnall): Trick docker-api into issuing a DELETE request by tag.
+        tag_image = Docker::Image.new Docker.connection, 'id' => image_tag
+        tag_image.delete
+      end
     end
   end
   private :destroy_all_images!

data/lib/contained_mr/job.rb

@@ -47,13 +47,15 @@ class ContainedMr::Job
     end
 
     unless @mapper_image_id.nil?
-      image = Docker::Image.get @mapper_image_id
+      # HACK(pwnall): Trick docker-api into issuing a DELETE request by tag.
+      image = Docker::Image.new Docker.connection, 'id' => mapper_image_tag
       image.remove
       @mapper_image_id = nil
     end
 
     unless @reducer_image_id.nil?
-      image = Docker::Image.get @reducer_image_id
+      # HACK(pwnall): Trick docker-api into issuing a DELETE request by tag.
+      image = Docker::Image.new Docker.connection, 'id' => reducer_image_tag
       image.remove
       @reducer_image_id = nil
     end

data/lib/contained_mr/template.rb

@@ -33,7 +33,8 @@ class ContainedMr::Template
   # This removes the template's base Docker image.
   def destroy!
     unless @image_id.nil?
-      image = Docker::Image.get @image_id
+      # HACK(pwnall): Trick docker-api into issuing a DELETE request by tag.
+      image = Docker::Image.new Docker.connection, 'id' => image_tag
       image.remove
       @image_id = nil
     end

data/test/test_cleaner.rb

@@ -0,0 +1,44 @@
+require 'helper'
+
+class TestCleaner < MiniTest::Test
+  def setup
+    @template = ContainedMr::Template.new 'contained_mrtests', 'hello',
+        StringIO.new(File.binread('testdata/hello.zip'))
+    @job = ContainedMr::Job.new @template, 'testjob',
+                                JSON.load(File.read('testdata/job.hello'))
+    @job.build_mapper_image File.read('testdata/input.hello')
+
+    @cleaner = ContainedMr::Cleaner.new 'contained_mrtests'
+  end
+
+  def test_destroy_all
+    @cleaner.destroy_all!
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get @job.mapper_image_tag
+    end
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get @template.image_tag
+    end
+  end
+
+  def test_destroy_all_with_duplicates
+    template2 = ContainedMr::Template.new 'contained_mrtests', 'hello2',
+        StringIO.new(File.binread('testdata/hello.zip'))
+    job2 = ContainedMr::Job.new template2, 'testjob2',
+                                JSON.load(File.read('testdata/job.hello'))
+    job2.build_mapper_image File.read('testdata/input.hello')
+    @cleaner.destroy_all!
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get job2.mapper_image_tag
+    end
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get template2.image_tag
+    end
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get @job.mapper_image_tag
+    end
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get @template.image_tag
+    end
+  end
+end

data/test/test_job.rb

@@ -5,7 +5,7 @@ class TestJob < MiniTest::Test
     @template = ContainedMr::Template.new 'contained_mrtests', 'hello',
         StringIO.new(File.binread('testdata/hello.zip'))
     @job = ContainedMr::Job.new @template, 'testjob',
-                           JSON.load(File.read('testdata/job.hello'))
+                                JSON.load(File.read('testdata/job.hello'))
   end
 
   def teardown
@@ -145,7 +145,42 @@ class TestJob < MiniTest::Test
     assert_raises Docker::Error::NotFoundError do
       Docker::Image.get @job.mapper_image_tag
     end
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get @job.reducer_image_tag
+    end
+  end
+
+  def test_destroy_with_two_jobs
+    @job.build_mapper_image File.read('testdata/input.hello')
+    1.upto(3) { |i| @job.run_mapper i }
+    @job.build_reducer_image
+
+    job2 = ContainedMr::Job.new @template, 'testjob2',
+                                JSON.load(File.read('testdata/job.hello'))
+    job2.build_mapper_image File.read('testdata/input.hello')
+    1.upto(3) { |i| job2.run_mapper i }
+    job2.build_reducer_image
+
+    job2.destroy!
+
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get job2.mapper_image_tag
+    end
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get job2.reducer_image_tag
+    end
+
+    image = Docker::Image.get @job.mapper_image_tag
+    assert image, "destroy! wiped the other job's mapper image"
+
+    image = Docker::Image.get @job.reducer_image_tag
+    assert image, "destroy! wiped the other job's reducer image"
+
+    @job.destroy!
 
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get @job.mapper_image_tag
+    end
     assert_raises Docker::Error::NotFoundError do
       Docker::Image.get @job.reducer_image_tag
     end

data/test/test_runner.rb

@@ -5,7 +5,7 @@ class TestRunner < MiniTest::Test
     @template = ContainedMr::Template.new 'contained_mrtests', 'hello',
         StringIO.new(File.binread('testdata/hello.zip'))
     @job = ContainedMr::Job.new @template, 'testjob',
-                           JSON.load(File.read('testdata/job.hello'))
+                                JSON.load(File.read('testdata/job.hello'))
     @job.build_mapper_image File.read('testdata/input.hello')
   end
 
@@ -16,7 +16,7 @@ class TestRunner < MiniTest::Test
 
   def test_perform_happy_path
     runner = ContainedMr::Runner.new @job.mapper_container_options(2), 2.5,
-                                @template.mapper_output_path
+                                     @template.mapper_output_path
     runner.perform
 
     assert_equal nil, runner.container_id, 'container still running'
@@ -31,7 +31,7 @@ class TestRunner < MiniTest::Test
 
   def test_perform_exit_code
     runner = ContainedMr::Runner.new @job.mapper_container_options(3), 2.5,
-                                @template.mapper_output_path
+                                     @template.mapper_output_path
     runner.perform
 
     assert_equal nil, runner.container_id, 'container still running'
@@ -42,7 +42,7 @@ class TestRunner < MiniTest::Test
 
   def test_perform_timeout
     runner = ContainedMr::Runner.new @job.mapper_container_options(1), 2.5,
-                                @template.mapper_output_path
+                                     @template.mapper_output_path
     runner.perform
 
     assert_equal nil, runner.container_id, 'container still running'

data/test/test_template.rb

@@ -47,4 +47,22 @@ class TestTemplate < MiniTest::Test
       Docker::Image.get @template.image_tag
     end
   end
+
+  def test_destory_with_two_templates
+    template2 = ContainedMr::Template.new 'contained_mrtests', 'hello2',
+        StringIO.new(File.binread('testdata/hello.zip'))
+
+    template2.destroy!
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get template2.image_tag
+    end
+
+    image = Docker::Image.get @template.image_tag
+    assert image, "destroy! wiped the other template's image"
+
+    @template.destroy!
+    assert_raises Docker::Error::NotFoundError do
+      Docker::Image.get @template.image_tag
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contained_mr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Victor Costan
@@ -144,6 +144,7 @@ files:
 - lib/contained_mr/runner.rb
 - lib/contained_mr/template.rb
 - test/helper.rb
+- test/test_cleaner.rb
 - test/test_job.rb
 - test/test_runner.rb
 - test/test_template.rb