node_record_id may be safer than worker_pid.

documentcloud · Mar 10, 2011 · 8788d47 · 8788d47
1 parent 963e21b
commit 8788d47
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/cloud_crowd/models/node_record.rb b/lib/cloud_crowd/models/node_record.rb
@@ -41,7 +41,6 @@ def self.check_in(params, request)
     # If the Node responds that it's overloaded, we mark it as busy. Returns
     # true if the WorkUnit was dispatched successfully.
     def send_work_unit(unit)
-      return false if unit.worker_pid #FIXME: Horrible hack.
       result = node['/work'].post(:work_unit => unit.to_json)
       unit.assign_to(self, JSON.parse(result.body)['pid'])
       touch && true

diff --git a/lib/cloud_crowd/models/work_unit.rb b/lib/cloud_crowd/models/work_unit.rb
@@ -81,7 +81,7 @@ def self.distribute_to_nodes
     # were none available.
     def self.reserve_available(options={})
       reservation = ActiveSupport::SecureRandom.random_number(MAX_RESERVATION)
-      conditions = "reservation is null and worker_pid is null and status in (#{INCOMPLETE.join(',')}) and #{options[:conditions]}"
+      conditions = "reservation is null and node_record_id is null and status in (#{INCOMPLETE.join(',')}) and #{options[:conditions]}"
       any = WorkUnit.update_all("reservation = #{reservation}", conditions, options) > 0
       any && reservation
     end