cloud-crowd 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88fe358ade9e482b1e3babde6470481f0a2610b4
-  data.tar.gz: 875f598e6160a237d322dd9fa2572e8519952cc7
+  metadata.gz: cca46d87f48a34b124b8b581e0f65f3d68b5595b
+  data.tar.gz: d0b1df360b9a5cd87bb3183b3c49480997890e71
 SHA512:
-  metadata.gz: df444794a6c2161fa6573e1efb85e1b045d65af5bed1681c842ca46359d433fe8e1b2116cfd89791e04e08eece282607da5a2117a2336e274dac1e906eb476ad
-  data.tar.gz: eb4cac079f21ff387415e1742c376f2c77f3019bf20067be0eaa91cc07bb82438af9f3e6aac3c9a58f966c2dc61668bd6fe6e081109c5aa45ad4e6a8beab57c9
+  metadata.gz: 1cf7261ba8b1333302a42793a0d2c18f4c00432a5e2b58c6ad3f01526895e985b8c82da1779d96bb400c1c182529f8e3150a82221a2543141d296c9e1e977b82
+  data.tar.gz: bebaf475fcc3ccce3d96db36658dc7d16e6fb3b9378788ae2c3623953d646792484cef5c3a562e3fdad3b97882244830419d0da93e5d09f87212a9a4738f1aac

data/cloud-crowd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'cloud-crowd'
-  s.version   = '0.7.2'         # Keep version in sync with cloud-cloud.rb
-  s.date      = '2014-04-17'
+  s.version   = '0.7.3'         # Keep version in sync with cloud-cloud.rb
+  s.date      = '2014-05-06'
 
   s.homepage    = "http://wiki.github.com/documentcloud/cloud-crowd"
   s.summary     = "Parallel Processing for the Rest of Us"
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   
   s.license = "MIT"
 
-  s.authors           = ['Jeremy Ashkenas', 'Ted Han']
+  s.authors           = ['Jeremy Ashkenas', 'Ted Han', 'Nathan Stitt']
   s.email             = 'opensource@documentcloud.org'
   s.rubyforge_project = 'cloud-crowd'
 

data/lib/cloud-crowd.rb

@@ -27,7 +27,7 @@ require 'socket'
 require 'net/http'
 require 'cloud_crowd/exceptions'
 require 'rest_client'
-
+require 'pathname'
 require 'active_model_serializers'
 ActiveModel::Serializer.root = false
 

data/lib/cloud_crowd/models/node_record.rb

@@ -44,11 +44,16 @@ module CloudCrowd
       result = node['/work'].post(:work_unit => unit.to_json)
       unit.assign_to(self, JSON.parse(result.body)['pid'])
       touch && true
+    rescue RestClient::RequestTimeout
+      # The node's gone away.  Destroy it and it will check in when it comes back
+      puts "Node #{host} received RequestTimeout, removing it"
+      destroy && false
     rescue RestClient::RequestFailed => e
       raise e unless e.http_code == 503 && e.http_body == Node::OVERLOADED_MESSAGE
       update_attribute(:busy, true) && false
-    rescue RestClient::Exception, Errno::ECONNREFUSED, Timeout::Error, RestClient::RequestTimeout, Errno::ECONNRESET
+    rescue RestClient::Exception, Errno::ECONNREFUSED, Timeout::Error, Errno::ECONNRESET=>e
       # Couldn't post to node, assume it's gone away.
+      puts "Node #{host} received #{e.class} #{e}, removing it"
       destroy && false
     end
 

data/lib/cloud_crowd/node.rb

@@ -175,8 +175,23 @@ module CloudCrowd
     def check_in_periodically
       @check_in_thread = CloudCrowd.defer do
         loop do
-          sleep CHECK_IN_INTERVAL
-          check_in
+          reply = ""
+          1.upto(5).each do | attempt_number |
+            # sleep for an ever increasing amount of time to prevent overloading the server
+            sleep CHECK_IN_INTERVAL * attempt_number
+            reply = check_in
+            # if we did not receive a reply, the server has went away; it
+            # will reply with an empty string if the check-in succeeds
+            if reply.nil?
+              puts "Failed on attempt # #{attempt_number} to check in with server"
+            else
+              break
+            end
+          end
+          if reply.nil?
+            puts "Giving up after repeated attempts to contact server"
+            raise SystemExit
+          end
         end
       end
     end
@@ -200,4 +215,4 @@ module CloudCrowd
 
   end
 
-end
+end

data/lib/cloud_crowd/server.rb

@@ -91,12 +91,15 @@ module CloudCrowd
 
     # INTERNAL NODE API:
 
-    # A new Node will this this action to register its location and
+    # A new Node will put to this action to register its location and
     # configuration with the central server. Triggers distribution of WorkUnits.
     put '/node/:host' do
       NodeRecord.check_in(params, request)
-      WorkUnit.distribute_to_nodes
       puts "Node #{params[:host]} checked in."
+      CloudCrowd.defer do
+        sleep 15 # Give the new node awhile to start listening
+        WorkUnit.distribute_to_nodes
+      end
       json nil
     end
 
@@ -117,7 +120,8 @@ module CloudCrowd
       when 'failed'    then current_work_unit.fail(params[:output], params[:time])
       else             error(500, "Completing a work unit must specify status.")
       end
-      WorkUnit.distribute_to_nodes
+      CloudCrowd.defer { WorkUnit.distribute_to_nodes }
+
       json nil
     end
 

data/test/acceptance/test_failing_work_units.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 # A Worker Daemon needs to be running to perform this integration test.
-class FailingWorkUnitsTest < Test::Unit::TestCase
+class FailingWorkUnitsTest < Minitest::Test
 
   should "retry work units when they fail" do
     WorkUnit.expects(:distribute_to_nodes).returns(true)

data/test/acceptance/test_node.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class NodeAcceptanceTest < Test::Unit::TestCase
+class NodeAcceptanceTest < Minitest::Test
   
   include Rack::Test::Methods
   

data/test/acceptance/test_server.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ServerTest < Test::Unit::TestCase
+class ServerTest < Minitest::Test
 
   include Rack::Test::Methods
 

data/test/acceptance/test_word_count.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class WordCountTest < Test::Unit::TestCase
+class WordCountTest < Minitest::Test
   
   context "the word_count action" do
     

data/test/test_helper.rb

@@ -19,7 +19,7 @@ CloudCrowd.configure_database(here + '/config/database.yml')
 
 require "#{CloudCrowd::ROOT}/test/blueprints.rb"
 
-class Test::Unit::TestCase
+class Minitest::Test
   include CloudCrowd
   include Shoulda::Matchers::ActiveRecord
   extend Shoulda::Matchers::ActiveRecord

data/test/unit/test_action.rb

@@ -7,7 +7,7 @@ end
 class EmptyAction < CloudCrowd::Action
 end
 
-class ActionTest < Test::Unit::TestCase
+class ActionTest < Minitest::Test
 
   context "A CloudCrowd::Action" do
 
@@ -18,7 +18,7 @@ class ActionTest < Test::Unit::TestCase
     end
 
     should "throw an exception if the 'process' method isn't implemented" do
-      assert_raise(NotImplementedError) { EmptyAction.new(*@args).process }
+      assert_raises(NotImplementedError) { EmptyAction.new(*@args).process }
     end
 
     should "have downloaded the input URL to local storage" do
@@ -55,7 +55,7 @@ class ActionTest < Test::Unit::TestCase
 
     should "raise an exception when backticks fail" do
       def @action.process; `utter failure 2>&1`; end
-      assert_raise(CloudCrowd::Error::CommandFailed) { @action.process }
+      assert_raises(CloudCrowd::Error::CommandFailed) { @action.process }
     end
 
     should "be able to download a remote file" do

data/test/unit/test_command_line.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CommandLineTest < Test::Unit::TestCase
+class CommandLineTest < Minitest::Test
   
   context "A CloudCrowd::CommandLine" do
     

data/test/unit/test_configuration.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ConfigurationTest < Test::Unit::TestCase
+class ConfigurationTest < Minitest::Test
 
   context "CloudCrowd Configuration" do
 

data/test/unit/test_job.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class JobTest < Test::Unit::TestCase
+class JobTest < Minitest::Test
 
   context "A CloudCrowd Job" do
         

data/test/unit/test_node.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class NodeUnitTest < Test::Unit::TestCase
+class NodeUnitTest < Minitest::Test
 
   context "A Node" do
 

data/test/unit/test_node_record.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class NodeRecordTest < Test::Unit::TestCase
+class NodeRecordTest < Minitest::Test
 
   context "A NodeRecord" do
         

data/test/unit/test_work_unit.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class WorkUnitTest < Test::Unit::TestCase
+class WorkUnitTest < Minitest::Test
 
   context "A WorkUnit" do
     

data/test/unit/test_worker.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class WorkerTest < Test::Unit::TestCase
+class WorkerTest < Minitest::Test
   
   context "A CloudCrowd::Worker" do
         

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cloud-crowd
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Jeremy Ashkenas
 - Ted Han
+- Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord