nexia_worker_roulette 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea8533bab4bfc550f23023bfa81f0befbcd107d
-  data.tar.gz: 0daa96c1b20b1c1621bbb4098b5726ff645e283a
+  metadata.gz: f0f447f3680d7e1b31c9bb64288bfcd272e06e0b
+  data.tar.gz: 37a831cc363e6ecab5aee296d4fb0790e05f2900
 SHA512:
-  metadata.gz: 507641dc68cffaaccdb6c5077e38039af0afce8b348f2c240a60048b76b04f3472a5246b04bfd671c6b3a41b5ee080e469844cc95020e6cc8f1457f8faca1d4f
-  data.tar.gz: 42b459a4d9288efd387c5c15d56c490c857de003d09d16d1f2aeec6bd3f2d39e4afa9ffd12a9faddd7454ae46c78d798d273ffc1ff93455fdb1e78568b4d722d
+  metadata.gz: f60bf31b75564128c79229d3504e4b7f1b22d79f20be3b9c4ed9845685c917d7fd7c478b277aead096a58dc4d2355f11b855edb411de12b2a130ba2bbb7bc0ab
+  data.tar.gz: 268b3765ffe7bc6dba03668a6a43184607640dfdd4a8376b157374bbbadc4a35c443f0155bc7e961c97f923aaf51dc377e004e89e8d6076924142ce0af4823c2

data/lib/worker_roulette/tradesman.rb

@@ -65,6 +65,43 @@ module WorkerRoulette
       return drain_work_orders(job_board_key, last_sender_key, empty_string)
     HERE
 
+    LUA_DRAIN_WORK_ORDERS_FOR_SENDER = <<-THERE
+      local empty_string     = ""
+      local job_board_key    = KEYS[1]
+      local sender_key       = KEYS[2] or empty_string
+      local redis_call       = redis.call
+      local lock_key_prefix  = "L*:"
+      local lock_value       = 1
+      local get              = "GET"
+      local del              = "DEL"
+      local lrange           = "LRANGE"
+      local zrange           = "ZRANGE"
+      local zrem             = "ZREM"
+
+      local function drain_work_orders_for_sender(job_board_key, sender_key)
+
+        if sender_key == empty_string then
+          return {empty_string, {}, 0}
+        end
+
+        local lock_key = lock_key_prefix .. sender_key
+        was_locked = redis_call(get, lock_key)
+
+        if was_locked == 1 then
+          local work_orders = redis_call(lrange, sender_key, 0, -1)
+          redis_call(del, sender_key)
+
+          redis_call(zrem, job_board_key, sender_key)
+
+          return { sender_key, work_orders }
+        else
+          return { sender_key, {} }
+        end
+      end
+
+      return drain_work_orders_for_sender(job_board_key, sender_key)
+    THERE
+
     def initialize(redis_pool, evented, namespace = nil, polling_time = WorkerRoulette::DEFAULT_POLLING_TIME)
       @evented        = evented
       @polling_time   = polling_time
@@ -99,6 +136,29 @@ module WorkerRoulette
       end
     end
 
+    def get_more_work_for_last_sender(&on_message_callback)
+      return unless on_message_callback
+      more_work_orders! do |work|
+        on_message_callback.call(work) if work.any?
+        if @evented
+          evented_drain_work_queue!(&on_message_callback)
+        else
+          non_evented_drain_work_queue!(&on_message_callback)
+        end
+      end
+    end
+
+    def more_work_orders!(&callback)
+      @lua.call(LUA_DRAIN_WORK_ORDERS_FOR_SENDER, [job_board_key, @last_sender]) do |results|
+        sender_key      = results[0]
+        raise "wrong sender key returned from LUA_DRAIN_WORK_ORDERS_FOR_SENDER" unless sender_key == @last_sender
+        work_orders     = results[1]
+        work            = work_orders.map {|work_order| WorkerRoulette.load(work_order)}
+        callback.call work if callback
+        work
+      end
+    end
+
     def job_board_key
       @job_board_key ||= WorkerRoulette.job_board_key(@namespace)
     end

data/lib/worker_roulette/version.rb

@@ -1,3 +1,3 @@
 module WorkerRoulette
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/spec/integration/worker_roulette_spec.rb

@@ -1,5 +1,9 @@
 require "spec_helper"
 module WorkerRoulette
+  class Tradesman
+    attr_reader :lua
+  end
+
   describe WorkerRoulette do
     let(:sender) {'katie_80'}
     let(:work_orders) {["hello", "foreman"]}
@@ -69,8 +73,8 @@ module WorkerRoulette
     end
 
     context Tradesman do
-      let(:foreman) { worker_roulette.foreman(sender) }
-      let(:tradesman) { worker_roulette.tradesman }
+      let(:foreman)        { worker_roulette.foreman(sender) }
+      subject(:tradesman)  { worker_roulette.tradesman }
 
       before do
         foreman.enqueue_work_order(work_orders)
@@ -153,6 +157,26 @@ module WorkerRoulette
         end
       end
 
+      it "goes back to the channel to get more work for the same sender" do
+        tradesman.wait_for_work_orders do |redis_work_orders|
+          expect(redis_work_orders).to eq([work_orders_with_headers])
+          expect(tradesman.last_sender).to eq('katie_80')
+          allow(tradesman).to receive(:wait_for_work_orders)
+        end
+
+        expect(tradesman.lua).to receive(:call).with(Tradesman::LUA_DRAIN_WORK_ORDERS_FOR_SENDER, [instance_of(String), sender])
+        tradesman.get_more_work_for_last_sender do |redis_work_orders|
+          expect(redis_work_orders).to eq([])
+        end
+
+        foreman.enqueue_work_order("more_work_orders")
+        expect(tradesman.lua).to receive(:call).with(Tradesman::LUA_DRAIN_WORK_ORDERS_FOR_SENDER, [instance_of(String), sender])
+        tradesman.get_more_work_for_last_sender do |redis_work_orders|
+          expect(redis_work_orders).to eq(["more_work_orders"])
+        end
+
+      end
+
       context "Failure" do
         it "should not put the sender_id and work_orders back if processing fails bc new work_orders may have been processed while that process failed" do; end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexia_worker_roulette
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Paul Saieg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj