fairway 0.3.2 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODBhZmUyMTQyYmZkMTk0ZmJkNGM3ZmQ4ZjdkZWUzNzc5MjRlMTE3Nw==
+    ZTYxMDc5ZDNmZWM4YmViYmExMzZlZTEyYTJhMmQ5ZTZkYzA5MGM2OQ==
   data.tar.gz: !binary |-
-    MzcxMWQxYjFkMzVhYTY4M2Y1M2M0YjRlY2NlZGU0YzVjYjIwZjFmNA==
+    ZjZhOTMyYTI0OTgzOTU3OTlmMTFhZDkyNzU4Y2U0NjVmOGQ4Yjc4NQ==
 SHA512:
   metadata.gz: !binary |-
-    NGE4NmM1Yzk5NGE2NzYxNTdiNjIxYzQzZDU3ZjZiZmVjNjNkYjZmNTNjNDUz
-    Y2IwNmViOTgxNmU5NjAzM2U2OTE2MWJmNTk1YTEyYWVmZWEyMDFlZmI2NDgy
-    NDE5OTJiNDk1YTY5YTRlMDNiODFmNWU2YTQ3ODZiZjE3MjA0YWU=
+    YmNlOTE3ODUzNmVmYWIwM2QwODUzN2NlMzM1NjAxMGQxMDk2ODY2NWE2Nzg5
+    ZjUyNTcwNzI5NmQxNjgxNzI5MDhjMDVhZDUxNDE3ODFiODZhZGFmZmRkNzYw
+    Njg0YjU3MjI5MDIxZTg4M2I4ZGE5ZGU5MmMwNWU0MGQyMmM4YzU=
   data.tar.gz: !binary |-
-    MDEwZDIwMzI0YzQ4Yzc0NDU2NWRkNzMxOGM5ZjkxMjMwY2I5NGFiYmU2NTE0
-    NjA1YTAxMmNmZjNmNjEzNWJmZWFlMjBkNzljZmVjZDZkYmY4YTQwODFiMWMy
-    NDFjZjA1OTNhZTc0MWM5YmVmZjU0MzMxMjRkMGEzNmE0MzRjNWQ=
+    NzhjMGQwMjg0YzIzYzcxMzJmODhkYTJkYmFkZmM0ZWM2NmQzN2ZmZmQxOWQw
+    NGE2YTJhNjJiMjg0NGZiOWE4MjhiYTdjNmZjZDYxZTY0YzljOWY1M2NiNTc2
+    NGM0ODQxNGJkNmM4YmVkYzFiMDNlNWM1ZmRjM2Y3NjM5ZDBkOTU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fairway (0.3.1)
+    fairway (0.3.3)
       activesupport
       connection_pool
       redis

data/go/fairway_ack.go

@@ -17,18 +17,19 @@ local round_robin    = k(queue, 'facet_queue');
 local facet_pool     = k(queue, 'facet_pool');
 local inflight       = k(queue, 'inflight');
 local messages       = k(queue, facet);
-local inflight_total = k(queue, facet .. ':inflight');
+local inflight_facet = k(queue, facet .. ':inflight');
 local inflight_limit = k(queue, 'limit');
 local priorities     = k(queue, 'priorities');
 
-local removed = tonumber(redis.call('zrem', inflight, message))
+local removed = tonumber(redis.call('zrem', inflight, message));
+redis.call('srem', inflight_facet, message);
 
 if removed > 0 then
   -- 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('decr', inflight_total)) or 0;
+  local inflight_cur  = tonumber(redis.call('scard', inflight_facet)) or 0;
   local inflight_max  = tonumber(redis.call('get', inflight_limit)) or 0;
 
   local n = 0
@@ -50,7 +51,7 @@ if removed > 0 then
   end
 
   if (length == 0 and inflight_cur == 0 and n == 0) then
-    redis.call('del', inflight_total);
+    redis.call('del', inflight_facet);
     redis.call('hdel', facet_pool, facet);
     redis.call('srem', active_facets, facet);
   end

data/go/fairway_deliver.go

@@ -27,8 +27,8 @@ for i = 1, #registered_queues, 2 do
     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');
+    -- local inflight_facet = 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
@@ -39,18 +39,18 @@ for i = 1, #registered_queues, 2 do
     -- 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 inflight_cur  = tonumber(redis.call('scard', inflight_facet)) 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
+    -- if inflight_max > 0 then
+    --   n = math.min(length, priority, inflight_max - inflight_cur);
+    -- else
       n = math.min(length, priority);
-    end
+    -- end
 
     -- redis.log(redis.LOG_WARNING, "PUSH: "..current.."/"..n);
 

data/go/fairway_pull.go

@@ -25,14 +25,14 @@ local pull = function (queue)
     -- has at least one message available to be pulled
     -- from it's message queue.
     local messages       = k(queue, facet);
-    local inflight_total = k(queue, facet .. ':inflight');
+    local inflight_facet = k(queue, facet .. ':inflight');
 
     message = redis.call('rpop', messages);
 
     if message then
       if wait ~= -1 then
         redis.call('zadd', inflight, timestamp + wait, message);
-        redis.call('incr', inflight_total);
+        redis.call('sadd', inflight_facet, message);
       end
 
       redis.call('decr', k(queue, 'length'));
@@ -49,12 +49,12 @@ local manage = function (queue, facet)
   local priorities     = k(queue, 'priorities');
   local facet_pool     = k(queue, 'facet_pool');
   local messages       = k(queue, facet);
-  local inflight_total = k(queue, facet .. ':inflight');
+  local inflight_facet = k(queue, facet .. ':inflight');
 
   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_cur  = tonumber(redis.call('scard', inflight_facet)) or 0;
   local inflight_max  = tonumber(redis.call('get', inflight_limit)) or 0;
   
   local n = 0
@@ -83,7 +83,7 @@ local manage = function (queue, facet)
   end
   
   if (length == 0 and inflight_cur == 0 and n == 0) then
-    redis.call('del', inflight_total);
+    redis.call('del', inflight_facet);
     redis.call('hdel', facet_pool, facet);
     redis.call('srem', active_facets, facet);
   end

data/go/queue_test.go

@@ -244,16 +244,16 @@ func QueueSpec(c gospec.Context) {
 			_, message := queue.Pull(2)
 			c.Expect(message.json(), Equals, msg1.json())
 
-			count, _ := redis.Int(r.Do("get", "fairway:myqueue:1:inflight"))
+			count, _ := redis.Int(r.Do("scard", "fairway:myqueue:1:inflight"))
 			c.Expect(count, Equals, 1)
 
 			_, message = queue.Pull(2)
 			c.Expect(message.json(), Equals, msg3.json())
 
-			count, _ = redis.Int(r.Do("get", "fairway:myqueue:1:inflight"))
+			count, _ = redis.Int(r.Do("scard", "fairway:myqueue:1:inflight"))
 			c.Expect(count, Equals, 1)
 
-			count, _ = redis.Int(r.Do("get", "fairway:myqueue:2:inflight"))
+			count, _ = redis.Int(r.Do("scard", "fairway:myqueue:2:inflight"))
 			c.Expect(count, Equals, 1)
 
 			_, message = queue.Pull(2)
@@ -261,10 +261,10 @@ func QueueSpec(c gospec.Context) {
 			_, message = queue.Pull(2)
 			c.Expect(message, IsNil)
 
-			count, _ = redis.Int(r.Do("get", "fairway:myqueue:1:inflight"))
+			count, _ = redis.Int(r.Do("scard", "fairway:myqueue:1:inflight"))
 			c.Expect(count, Equals, 1)
 
-			count, _ = redis.Int(r.Do("get", "fairway:myqueue:2:inflight"))
+			count, _ = redis.Int(r.Do("scard", "fairway:myqueue:2:inflight"))
 			c.Expect(count, Equals, 1)
 
 			queue.Ack(msg1)
@@ -273,20 +273,20 @@ func QueueSpec(c gospec.Context) {
 			queue.Ack(msg1)
 			queue.Ack(msg1)
 
-			count, err := redis.Int(r.Do("get", "fairway:myqueue:1:inflight"))
+			count, err := redis.Int(r.Do("scard", "fairway:myqueue:1:inflight"))
 			c.Expect(count, Equals, 0)
 			c.Expect(err, IsNil)
 
-			count, _ = redis.Int(r.Do("get", "fairway:myqueue:2:inflight"))
+			count, _ = redis.Int(r.Do("scard", "fairway:myqueue:2:inflight"))
 			c.Expect(count, Equals, 1)
 
 			_, message = queue.Pull(2)
 			c.Expect(message.json(), Equals, msg2.json())
 
-			count, _ = redis.Int(r.Do("get", "fairway:myqueue:1:inflight"))
+			count, _ = redis.Int(r.Do("scard", "fairway:myqueue:1:inflight"))
 			c.Expect(count, Equals, 1)
 
-			count, _ = redis.Int(r.Do("get", "fairway:myqueue:2:inflight"))
+			count, _ = redis.Int(r.Do("scard", "fairway:myqueue:2:inflight"))
 			c.Expect(count, Equals, 1)
 		})
 

data/lib/fairway/version.rb

@@ -1,3 +1,3 @@
 module Fairway
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

data/redis/fairway_deliver.lua

@@ -23,8 +23,8 @@ for i = 1, #registered_queues, 2 do
     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');
+    -- local inflight_facet = 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
@@ -35,18 +35,18 @@ for i = 1, #registered_queues, 2 do
     -- 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 inflight_cur  = tonumber(redis.call('scard', inflight_facet)) 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
+    -- if inflight_max > 0 then
+    --   n = math.min(length, priority, inflight_max - inflight_cur);
+    -- else
       n = math.min(length, priority);
-    end
+    -- end
 
     -- redis.log(redis.LOG_WARNING, "PUSH: "..current.."/"..n);
 

data/redis/fairway_pull.lua

@@ -21,14 +21,14 @@ local pull = function (queue)
     -- has at least one message available to be pulled
     -- from it's message queue.
     local messages       = k(queue, facet);
-    local inflight_total = k(queue, facet .. ':inflight');
+    local inflight_facet = k(queue, facet .. ':inflight');
 
     message = redis.call('rpop', messages);
 
     if message then
       if wait ~= -1 then
         redis.call('zadd', inflight, timestamp + wait, message);
-        redis.call('incr', inflight_total);
+        redis.call('sadd', inflight_facet, message);
       end
 
       redis.call('decr', k(queue, 'length'));
@@ -45,12 +45,12 @@ local manage = function (queue, facet)
   local priorities     = k(queue, 'priorities');
   local facet_pool     = k(queue, 'facet_pool');
   local messages       = k(queue, facet);
-  local inflight_total = k(queue, facet .. ':inflight');
+  local inflight_facet = k(queue, facet .. ':inflight');
 
   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_cur  = tonumber(redis.call('scard', inflight_facet)) or 0;
   local inflight_max  = tonumber(redis.call('get', inflight_limit)) or 0;
   
   local n = 0
@@ -79,7 +79,7 @@ local manage = function (queue, facet)
   end
   
   if (length == 0 and inflight_cur == 0 and n == 0) then
-    redis.call('del', inflight_total);
+    redis.call('del', inflight_facet);
     redis.call('hdel', facet_pool, facet);
     redis.call('srem', active_facets, facet);
   end
@@ -130,4 +130,3 @@ for i, queue in ipairs(ARGV) do
     return {queue, message};
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - John Allison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport