fairway 0.2.7 → 0.3.1

data/redis/fairway_deliver.lua

@@ -19,39 +19,45 @@ for i = 1, #registered_queues, 2 do
   -- If the message topic matches the queue topic,
   -- we deliver the message to the queue.
   if string.find(topic, queue_topic) then
-    local priorities    = k(queue, 'priorities');
-    local active_facets = k(queue, 'active_facets');
-    local round_robin   = k(queue, 'facet_queue');
-    local facet_pool    = k(queue, 'facet_pool');
+    local priorities     = k(queue, 'priorities');
+    local active_facets  = k(queue, 'active_facets');
+    local round_robin    = k(queue, 'facet_queue');
+    local facet_pool     = k(queue, 'facet_pool');
+    local inflight_total = k(queue, facet .. ':inflight');
+    local inflight_limit = k(queue, 'limit');
 
     -- Delivering the message to a queue is as simple as
     -- pushing it onto the facet's message list, and
     -- incrementing the length of the queue itself.
-    redis.call('lpush', k(queue, facet), message)
+    local length = redis.call('lpush', k(queue, facet), message)
     redis.call('incr', k(queue, 'length'));
 
-    -- If the facet just became active, we need to add
-    -- the facet to the round-robin queue, so it's
-    -- messages will be processed.
-    if redis.call('sadd', active_facets, facet) == 1 then
-      local priority = tonumber(redis.call('hget', priorities, facet)) or 1
-
-      -- If the facet currently has a priority
-      -- we need to jump start the facet by adding
-      -- it to the round-robin queue and updating
-      -- the current priority.
-      if priority > 0 then
-        redis.call('lpush', round_robin, facet);
-        redis.call('hset', facet_pool, facet, 1);
-      
-      -- If the facet has no set priority, just set the
-      -- current priority to zero. Since the facet just
-      -- became active, we can be sure it's already zero
-      -- or undefined.
-      else
-        redis.call('hset', facet_pool, facet, 0);
-      end
+
+    -- Manage facet queue and active facets
+    local current       = tonumber(redis.call('hget', facet_pool, facet)) or 0;
+    local priority      = tonumber(redis.call('hget', priorities, facet)) or 1;
+    local inflight_cur  = tonumber(redis.call('get', inflight_total)) or 0;
+    local inflight_max  = tonumber(redis.call('get', inflight_limit)) or 0;
+
+    local n = 0
+
+    -- redis.log(redis.LOG_WARNING, current.."/"..length.."/"..priority.."/"..inflight_max.."/"..inflight_cur);
+
+    if inflight_max > 0 then
+      n = math.min(length, priority, inflight_max - inflight_cur);
+    else
+      n = math.min(length, priority);
     end
+
+    -- redis.log(redis.LOG_WARNING, "PUSH: "..current.."/"..n);
+
+    if n > current then
+      -- redis.log(redis.LOG_WARNING, "growing");
+      redis.call('lpush', round_robin, facet);
+      redis.call('hset', facet_pool, facet, current + 1);
+    end
+
+    redis.call('sadd', active_facets, facet)
   end
 end
 

data/redis/fairway_priority.lua

@@ -13,7 +13,7 @@ local facet_pool  = k(queue, 'facet_pool');
 
 -- Find the current state of the facet for the queue
 local priority = tonumber(redis.call('hget', priorities, facet)) or 1;
-local current  = tonumber(redis.call('hget', facet_pool, facet));
+local current  = tonumber(redis.call('hget', facet_pool, facet)) or 0;
 
 -- If priority is currently zero, we need to jump
 -- start the facet by adding it to the round-robin

data/redis/fairway_pull.lua

@@ -1,4 +1,6 @@
 local namespace = KEYS[1];
+local timestamp = tonumber(KEYS[2]);
+local wait = tonumber(KEYS[3]);
 
 local k = function (queue, subkey)
   return namespace .. queue .. ':' .. subkey;
@@ -9,10 +11,28 @@ end
 -- provided queues, and return a message
 -- from the first one that isn't empty.
 for i, queue in ipairs(ARGV) do
-  local priorities    = k(queue, 'priorities');
-  local active_facets = k(queue, 'active_facets');
-  local round_robin   = k(queue, 'facet_queue');
-  local facet_pool    = k(queue, 'facet_pool');
+  local active_facets  = k(queue, 'active_facets');
+  local round_robin    = k(queue, 'facet_queue');
+  local inflight       = k(queue, 'inflight');
+  local inflight_limit = k(queue, 'limit');
+  local priorities     = k(queue, 'priorities');
+  local facet_pool     = k(queue, 'facet_pool');
+
+  if wait ~= -1 then
+    -- Check if any current inflight messages
+    -- have been inflight for a long time.
+    local inflightmessage = redis.call('zrange', inflight, 0, 0, 'WITHSCORES');
+
+    -- If we have an inflight message and it's score
+    -- is less than the current pull timestamp, reset
+    -- the inflight score for the the message and resend.
+    if #inflightmessage > 0 then
+      if tonumber(inflightmessage[2]) <= timestamp then
+        redis.call('zadd', inflight, timestamp + wait, inflightmessage[1]);
+        return {queue, inflightmessage[1]}
+      end
+    end
+  end
 
   -- Pull a facet from the round-robin list.
   -- This list guarantees each active facet will have a
@@ -23,68 +43,55 @@ for i, queue in ipairs(ARGV) do
     -- If we found an active facet, we know the facet
     -- has at least one message available to be pulled
     -- from it's message queue.
-    local messages = k(queue, facet);
-    local message  = redis.call('rpop', messages);
+    local messages       = k(queue, facet);
+    local inflight_total = k(queue, facet .. ':inflight');
+
+    local message = redis.call('rpop', messages);
 
     if message then
+      if wait ~= -1 then
+        redis.call('zadd', inflight, timestamp + wait, message);
+        redis.call('incr', inflight_total);
+      end
+
       redis.call('decr', k(queue, 'length'));
     end
 
-    local length = redis.call('llen', messages);
+    -- Manage facet queue and active facets
+    local current       = tonumber(redis.call('hget', facet_pool, facet)) or 0;
+    local priority      = tonumber(redis.call('hget', priorities, facet)) or 1;
+    local length        = redis.call('llen', messages);
+    local inflight_cur  = tonumber(redis.call('get', inflight_total)) or 0;
+    local inflight_max  = tonumber(redis.call('get', inflight_limit)) or 0;
 
-    -- If the length of the facet's message queue
-    -- is empty, then it is no longer active as
-    -- it no longer has any messages.
-    if length == 0 then
-      -- We remove the facet from the set of active
-      -- facets and don't push the facet back on the
-      -- round-robin queue.
-      redis.call('srem', active_facets, facet);
-     
-    -- If the facet still has messages to process,
-    -- it remains in the active facet set, and is
-    -- pushed back on the round-robin queue.
-    --
-    -- Additionally, the priority of the facet may
-    -- have changed, so we'll check and update the
-    -- current facet's priority if needed.
+    local n = 0
+
+    -- redis.log(redis.LOG_WARNING, current.."/"..length.."/"..priority.."/"..inflight_max.."/"..inflight_cur);
+
+    if inflight_max > 0 then
+      n = math.min(length, priority, inflight_max - inflight_cur);
     else
-      local priority = tonumber(redis.call('hget', priorities, facet)) or 1
-      local current  = tonumber(redis.call('hget', facet_pool, facet)) or 1
-
-      -- If the current priority is less than the
-      -- desired priority, let's increase the priority
-      -- by pushing the current facet on the round-robin
-      -- queue twice, and incrementing the current
-      -- priority.
-      --
-      -- Note: If there aren't enough messages left
-      -- on the facet, we don't increase priority.
-      if current < priority and length > current then
-        redis.call('lpush', round_robin, facet);
-        redis.call('lpush', round_robin, facet);
-        redis.call('hset', facet_pool, facet, current + 1);
-        
-      -- If the current priority is greater than the
-      -- desired priority, let's decrease the priority
-      -- by not pushing the current facet on the round-robin
-      -- queue, and decrementing the current priority.
-      --
-      -- Note: Also decrement priority if there aren't
-      -- enough messages for the current priority. This
-      -- ensures priority (entries in the round-robin queue)
-      -- never exceeds the number of messages for a given
-      -- facet.
-      elseif current > priority or current > length then
-        redis.call('hset', facet_pool, facet, current - 1);
-      
-      -- If the current priority is equals the
-      -- desired priority, let's maintain the current priority
-      -- by pushing the current facet on the round-robin
-      -- queue once.
-      else
-        redis.call('lpush', round_robin, facet);
-      end
+      n = math.min(length, priority);
+    end
+
+    -- redis.log(redis.LOG_WARNING, "PULL: "..current.."/"..n);
+
+    if n < current then
+      -- redis.log(redis.LOG_WARNING, "shrinking");
+      redis.call('hset', facet_pool, facet, current - 1);
+    elseif n > current then
+      -- redis.log(redis.LOG_WARNING, "growing");
+      redis.call('lpush', round_robin, facet);
+      redis.call('lpush', round_robin, facet);
+      redis.call('hset', facet_pool, facet, current + 1);
+    else
+      -- redis.log(redis.LOG_WARNING, "maintaining");
+      redis.call('lpush', round_robin, facet);
+    end
+
+    if (current == 1 and length == 0 and inflight_cur == 0 and n == 0) then
+      redis.call('del', inflight_total);
+      redis.call('srem', active_facets, facet);
     end
 
     return {queue, message};

data/spec/lib/fairway/channeled_connection_spec.rb

@@ -75,6 +75,7 @@ module Fairway
         it "doesn't push onto to facet queue if currently active" do
           redis.with do |conn|
             conn.sadd("myqueue:active_facets", "1")
+            conn.hset("myqueue:facet_pool", "1", "1")
             connection.deliver(message)
             conn.llen("myqueue:facet_queue").should == 0
           end

data/spec/lib/fairway/connection_spec.rb

@@ -88,6 +88,7 @@ module Fairway
         it "doesn't push onto to facet queue if currently active" do
           redis.with do |conn|
             conn.sadd("myqueue:active_facets", "1")
+            conn.hset("myqueue:facet_pool", "1", "1")
             connection.deliver(message)
             conn.llen("myqueue:facet_queue").should == 0
           end

data/spec/lib/fairway/queue_spec.rb

@@ -139,7 +139,7 @@ module Fairway
         it "randomized order of queues attempted to reduce starvation" do
           order = {}
 
-          queue.connection.scripts.stub(:fairway_pull) do |queues|
+          queue.connection.scripts.stub(:fairway_pull) do |timstamp, wait, queues|
             order[queues.join(":")] ||= 0
             order[queues.join(":")] += 1
           end
@@ -158,7 +158,7 @@ module Fairway
 
           order = {}
 
-          queue.connection.scripts.stub(:fairway_pull) do |queues|
+          queue.connection.scripts.stub(:fairway_pull) do |timestamp, wait, queues|
             order[queues.join(":")] ||= 0
             order[queues.join(":")] += 1
           end
@@ -286,7 +286,7 @@ module Fairway
         queue.pull.should == ["myqueue", message1.to_json]
       end
 
-      it "defaults current priority to 1 if currently nil (migration from 0.0.x to 0.1.x scenario)" do
+      it "defaults current priority to 1 if currently nil" do
         connection.deliver(message1)
         connection.deliver(message1)
         connection.deliver(message2)
@@ -294,10 +294,6 @@ module Fairway
         connection.deliver(message2)
         connection.deliver(message1)
 
-        connection.redis.with do |conn|
-          conn.del("myqueue:facet_pool")
-        end
-
         queue.pull.should == ["myqueue", message1.to_json]
         queue.pull.should == ["myqueue", message2.to_json]
         queue.pull.should == ["myqueue", message1.to_json]

data/spec/lib/fairway/scripts_spec.rb

@@ -54,7 +54,7 @@ module Fairway
       let(:scripts) { Scripts.new(redis, "foo") }
 
       it "runs the script" do
-        scripts.fairway_pull("namespace", "name")
+        scripts.fairway_pull(Time.now.to_i, -1, "name")
       end
 
       context "when the script does not exist" do
@@ -63,7 +63,7 @@ module Fairway
             conn.script(:flush)
           end
 
-          scripts.fairway_pull("namespace", "name")
+          scripts.fairway_pull(Time.now.to_i, -1, "name")
         end
       end
     end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.1
 platform: ruby
 authors:
 - John Allison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A fair way to queue work in multi-user systems.
@@ -88,9 +88,12 @@ files:
 - go/config_test.go
 - go/connection.go
 - go/connection_test.go
+- go/fairway_ack.go
 - go/fairway_deliver.go
 - go/fairway_destroy.go
+- go/fairway_inflight.go
 - go/fairway_peek.go
+- go/fairway_ping.go
 - go/fairway_priority.go
 - go/fairway_pull.go
 - go/message.go
@@ -135,17 +138,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A fair way to queue work in multi-user systems.