cloud-crowd 0.5.0 → 0.5.2

data/cloud-crowd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'cloud-crowd'
-  s.version   = '0.5.0'         # Keep version in sync with cloud-cloud.rb
-  s.date      = '2010-06-22'
+  s.version   = '0.5.2'         # Keep version in sync with cloud-cloud.rb
+  s.date      = '2010-08-03'
 
   s.homepage    = "http://wiki.github.com/documentcloud/cloud-crowd"
   s.summary     = "Parallel Processing for the Rest of Us"
@@ -113,4 +113,4 @@ test/unit/test_worker.rb
 test/unit/test_work_unit.rb
 views/operations_center.erb
 )
-end
+end

data/lib/cloud-crowd.rb

@@ -45,7 +45,7 @@ module CloudCrowd
   autoload :WorkUnit,     'cloud_crowd/models'
 
   # Keep this version in sync with the gemspec.
-  VERSION        = '0.5.0'
+  VERSION        = '0.5.2'
 
   # Increment the schema version when there's a backwards incompatible change.
   SCHEMA_VERSION = 4
@@ -59,6 +59,9 @@ module CloudCrowd
   # Default folder to contain the pids of daemonized servers and nodes.
   PID_PATH       = 'tmp/pids'
 
+  # Minimum number of attempts per work unit.
+  MIN_RETRIES    = 1
+
   # A Job is processing if its WorkUnits are in the queue to be handled by nodes.
   PROCESSING     = 1
 
@@ -94,6 +97,7 @@ module CloudCrowd
     def configure(config_path)
       @config_path = File.expand_path(File.dirname(config_path))
       @config = YAML.load(ERB.new(File.read(config_path)).result)
+      @config[:work_unit_retries] ||= MIN_RETRIES
     end
 
     # Configure the CloudCrowd central database (and connect to it), by passing
@@ -133,7 +137,10 @@ module CloudCrowd
     # a connection, and a timeout of 30 to finish reading it.
     def client_options
       return @client_options if @client_options
-      @client_options = {:timeout => 30, :open_timeout => 5}
+      @client_options = {
+        :timeout => (self.server? ? config[:node_timeout] : config[:server_timeout]) || 30,
+        :open_timeout => config[:open_timeout] || 5
+      }
       if CloudCrowd.config[:http_authentication]
         @client_options[:user]      = CloudCrowd.config[:login]
         @client_options[:password]  = CloudCrowd.config[:password]
@@ -186,4 +193,4 @@ module CloudCrowd
 
   end
 
-end
+end

data/lib/cloud_crowd/models/node_record.rb

@@ -47,7 +47,7 @@ module CloudCrowd
     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
+    rescue RestClient::Exception, Errno::ECONNREFUSED, Timeout::Error, RestClient::RequestTimeout, Errno::ECONNRESET
       # Couldn't post to node, assume it's gone away.
       destroy && false
     end

data/lib/cloud_crowd/models/work_unit.rb

@@ -41,6 +41,7 @@ module CloudCrowd
       reservation = nil
       filter = {}
       loop do
+        WorkUnit.cancel_reservations(reservation) if reservation
         return unless reservation = WorkUnit.reserve_available(:limit => RESERVATION_LIMIT, :conditions => filter)
         work_units = WorkUnit.reserved(reservation)
         available_nodes = NodeRecord.available
@@ -69,7 +70,7 @@ module CloudCrowd
     # were none available.
     def self.reserve_available(options={})
       reservation = ActiveSupport::SecureRandom.random_number(MAX_RESERVATION)
-      any = WorkUnit.available.update_all("reservation = #{reservation}", nil, options) > 0
+      any = WorkUnit.available.update_all("reservation = #{reservation}", options[:conditions], options) > 0
       any && reservation
     end
 

data/lib/cloud_crowd/server.rb

@@ -70,7 +70,7 @@ module CloudCrowd
     # Distributes all work units to available nodes.
     post '/jobs' do
       job = Job.create_from_request(JSON.parse(params[:job]))
-      WorkUnit.distribute_to_nodes
+      Thread.new { WorkUnit.distribute_to_nodes }
       puts "Job ##{job.id} (#{job.action}) started." unless ENV['RACK_ENV'] == 'test'
       json job
     end
@@ -128,4 +128,4 @@ module CloudCrowd
 
   end
 
-end
+end

data/lib/cloud_crowd/worker.rb

@@ -24,6 +24,7 @@ module CloudCrowd
       @unit       = unit
       @status     = @unit['status']
       @retry_wait = RETRY_WAIT
+      $0 = "#{unit['action']} (#{unit['id']}) [cloud-crowd-worker]"
     end
 
     # Return output to the central server, marking the WorkUnit done.
@@ -146,4 +147,4 @@ module CloudCrowd
 
   end
 
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloud-crowd
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -04:00
+date: 2010-08-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 9
@@ -34,9 +37,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 2
         - 3
@@ -47,9 +52,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 1
@@ -61,9 +68,11 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -74,9 +83,11 @@ dependencies:
   name: thin
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 2
@@ -88,9 +99,11 @@ dependencies:
   name: faker
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 3
@@ -102,9 +115,11 @@ dependencies:
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 2
         - 10
@@ -116,9 +131,11 @@ dependencies:
   name: notahat-machinist
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 0
@@ -130,9 +147,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 4
@@ -144,9 +163,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 53
         segments: 
         - 0
         - 9
@@ -233,6 +254,7 @@ files:
 - test/unit/test_worker.rb
 - test/unit/test_work_unit.rb
 - views/operations_center.erb
+- bin/crowd
 has_rdoc: true
 homepage: http://wiki.github.com/documentcloud/cloud-crowd
 licenses: []
@@ -249,23 +271,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: cloud-crowd
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Parallel Processing for the Rest of Us