gru 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8569b8dac503cf08983a463bb293a277f09f301
-  data.tar.gz: 45da184cdbe70af5c0f871d65a9d4f60de2555f6
+  metadata.gz: 15b0d3917dc6d07575874b7f0a87cbc5b109214c
+  data.tar.gz: 1d164bcef80f5b1f7e6a3594de72e6715847a85a
 SHA512:
-  metadata.gz: ad6bc8c502243e5f9f8ce86dfe6275758f4eff9ad55f562d070ad99484782f58d1bb49730413d3314e42c5dd92b8fb6f4950a9c290fb97d1168692fd168a264a
-  data.tar.gz: 21d48ee74d9fc7bda158b7f2485bbb97ba35b6e9401bbc2a306070a802262f8ae7a78c65df7fdb0d552d6e013cdffcedd95989cd61719e59b10c31cdab60fea8
+  metadata.gz: 45547c39e99a83b4c30c5e8e50aee8a47e24b6bfc120f4ca245ad6ef7df872ab54991a032716d2c57467b15531d53c6fe1fe9e0f8e36103c92fab236175b5366
+  data.tar.gz: d942a5d16235720661c81f3af3ab841300b55f7dd0d54732fd0c308d9da4bd18743f11535bb595fa0dfe8c15ba2ca74fd0fd74d0f55ef2404a9d519851488ea3

data/lib/gru/adapters/redis_adapter.rb

@@ -18,6 +18,7 @@ module Gru
         set_max_worker_counts(@settings.host_maximums)
         register_global_workers(@settings.cluster_maximums)
         set_max_global_worker_counts(@settings.cluster_maximums)
+        remove_stale_worker_entries
         update_heartbeat if manage_heartbeat?
       end
 
@@ -79,6 +80,13 @@ module Gru
         false
       end
 
+      def remove_stale_worker_entries
+        stale_keys = max_global_workers.keys - @settings.cluster_maximums.keys
+        stale_keys.each do |key|
+          send_message(:hdel, global_max_worker_key, key)
+        end
+      end
+
       private
 
       def register_workers(workers)
@@ -164,8 +172,8 @@ module Gru
       end
 
       def adjust_workers(worker,amount)
-        lock_key = "#{gru_key}:#{worker}"
-        if send_message(:setnx,lock_key,Time.now.to_i)
+        lock_key = "#{gru_key}:locks:#{worker}"
+        if send_message(:set,lock_key,Time.now.to_i, { nx: true, px: 10000 })
           send_message(:hincrby,host_workers_running_key,worker,amount)
           send_message(:hincrby,global_workers_running_key,worker,amount)
           send_message(:del,lock_key)

data/lib/gru/version.rb

@@ -1,3 +1,3 @@
 module Gru
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/gru/adapters/redis_adapter_spec.rb

@@ -81,8 +81,8 @@ describe Gru::Adapters::RedisAdapter do
         expect(client).to receive(:multi).exactly(3).times.and_yield(client).and_return([0,-1,3,3])
         expect(client).to receive(:hset).with("#{gru_key}:global:workers_running",'test_worker', 0)
         expect(client).to receive(:hget).with("#{gru_key}:global:workers_running",'test_worker').exactly(1).times.and_return(0)
-        expect(client).to receive(:setnx).exactly(3).times.and_return(true)
-        expect(client).to receive(:del).with("#{gru_key}:test_worker").exactly(3).times
+        expect(client).to receive(:set).exactly(3).times.and_return(true)
+        expect(client).to receive(:del).with("#{gru_key}:locks:test_worker").exactly(3).times
         expect(client).to receive(:get).with("#{gru_key}:rebalance").exactly(3).times
         expect(client).to receive(:hgetall).with("#{gru_key}:#{hostname}:workers_running").exactly(3).times.and_return({'test_worker' => '1'})
         expect(client).to receive(:hincrby).with("#{gru_key}:global:workers_running",'test_worker',1).exactly(3).times
@@ -97,8 +97,8 @@ describe Gru::Adapters::RedisAdapter do
 
       it "returns workers when max local and global counts have not been reached" do
         expect(client).to receive(:multi).exactly(3).times.and_yield(client).and_return([1,1,3,3])
-        expect(client).to receive(:setnx).exactly(3).times.and_return(true)
-        expect(client).to receive(:del).with("#{gru_key}:test_worker").exactly(3).times
+        expect(client).to receive(:set).exactly(3).times.and_return(true)
+        expect(client).to receive(:del).with("#{gru_key}:locks:test_worker").exactly(3).times
         expect(client).to receive(:get).with("#{gru_key}:rebalance").exactly(3).times
         expect(client).to receive(:hgetall).with("#{gru_key}:#{hostname}:workers_running").exactly(3).times.and_return({'test_worker' => '1'})
         expect(client).to receive(:hincrby).with("#{gru_key}:global:workers_running",'test_worker',1).exactly(3).times
@@ -173,8 +173,8 @@ describe Gru::Adapters::RedisAdapter do
 
     it "removes workers when local maximum has been exceeded" do
       expect(client).to receive(:multi).exactly(1).times.and_yield(client).and_return([3,3,1,3])
-      expect(client).to receive(:setnx).exactly(1).times.and_return(true)
-      expect(client).to receive(:del).with("#{gru_key}:test_worker").exactly(1).times
+      expect(client).to receive(:set).exactly(1).times.and_return(true)
+      expect(client).to receive(:del).with("#{gru_key}:locks:test_worker").exactly(1).times
       expect(client).to receive(:hincrby).with("#{gru_key}:global:workers_running",'test_worker',-1).exactly(1).times
       expect(client).to receive(:hincrby).with("#{gru_key}:#{hostname}:workers_running",'test_worker',-1).exactly(1).times
       expect(adapter.expire_workers).to eq({'test_worker' => -1})
@@ -182,8 +182,8 @@ describe Gru::Adapters::RedisAdapter do
 
     it "removes workers when global maximum has been exceeded" do
       expect(client).to receive(:multi).exactly(1).times.and_yield(client).and_return([3,3,3,1])
-      expect(client).to receive(:setnx).exactly(1).times.and_return(true)
-      expect(client).to receive(:del).with("#{gru_key}:test_worker").exactly(1).times
+      expect(client).to receive(:set).exactly(1).times.and_return(true)
+      expect(client).to receive(:del).with("#{gru_key}:locks:test_worker").exactly(1).times
       expect(client).to receive(:hincrby).with("#{gru_key}:global:workers_running",'test_worker',-1).exactly(1).times
       expect(client).to receive(:hincrby).with("#{gru_key}:#{hostname}:workers_running",'test_worker',-1).exactly(1).times
       expect(adapter.expire_workers).to eq({'test_worker' => -1})
@@ -225,10 +225,10 @@ describe Gru::Adapters::RedisAdapter do
       expect(client).to receive(:hget).with("#{gru_key}:global:max_workers",'test_worker').exactly(3).times
       expect(client).to receive(:keys).with("#{gru_key}:*:workers_running").exactly(3).times.and_return(['foo'])
       expect(client).to receive(:hgetall).with("#{gru_key}:#{hostname}:workers_running").exactly(3).times.and_return({'test_worker' => '1'})
-      expect(client).to receive(:setnx).exactly(3).times.and_return(true)
+      expect(client).to receive(:set).exactly(3).times.and_return(true)
       expect(client).to receive(:hincrby).with("#{gru_key}:global:workers_running",'test_worker',1).exactly(3).times
       expect(client).to receive(:hincrby).with("#{gru_key}:#{hostname}:workers_running",'test_worker',1).exactly(3).times
-      expect(client).to receive(:del).with("#{gru_key}:test_worker").exactly(3).times
+      expect(client).to receive(:del).with("#{gru_key}:locks:test_worker").exactly(3).times
       expect(client).to receive(:get).with("#{gru_key}:rebalance").and_return("true").exactly(3).times
       adapter.provision_workers
     end
@@ -250,12 +250,12 @@ describe Gru::Adapters::RedisAdapter do
     it "provisions workers if local proc max hasn't been reached" do
       expect(client).to receive(:multi).exactly(3).times.and_yield(client).and_return([9,20,20,30], [10,20,20,30])
       expect(client).to receive(:hgetall).with("#{gru_key}:#{hostname}:max_workers").and_return(config.cluster_maximums)
-      expect(client).to receive(:setnx).exactly(1).times.and_return(true)
+      expect(client).to receive(:set).exactly(1).times.and_return(true)
       expect(client).to receive(:hgetall).with("#{gru_key}:#{hostname}:workers_running").exactly(3).times.and_return(
         {'test_worker' => '9'}, {'test_worker' => '10'}, {'test_worker' => '10'})
       expect(client).to receive(:hincrby).with("#{gru_key}:foo:workers_running",'test_worker',1).exactly(1).times
       expect(client).to receive(:hincrby).with("#{gru_key}:global:workers_running",'test_worker',1).exactly(1).times
-      expect(client).to receive(:del).with("#{gru_key}:test_worker").exactly(1).times
+      expect(client).to receive(:del).with("#{gru_key}:locks:test_worker").exactly(1).times
       expect(client).to receive(:keys).with("#{gru_key}:*:workers_running").exactly(3).times.and_return(["test1","test2"])
       expect(client).to receive(:get).with("#{gru_key}:rebalance").exactly(3).times.and_return("true")
       expect(client).to receive(:hget).with("#{gru_key}:#{hostname}:max_workers",'test_worker').exactly(3).times

data/spec/gru/gru_integration_spec.rb

@@ -485,4 +485,34 @@ xdescribe Gru do
       })
     end
   end
+
+  context "Remove Stale Workers" do
+    let(:new_settings) {
+      {
+        cluster_maximums: {
+        'foo_worker' => '3'
+        }
+      }
+    }
+
+    let(:adapter1) {
+      adapter1 = Gru::Adapters::RedisAdapter.new(Gru::Configuration.new(settings.clone))
+      allow(adapter1).to receive(:hostname).and_return('test1')
+      adapter1
+    }
+
+    let(:adapter2) {
+      adapter2 = Gru::Adapters::RedisAdapter.new(Gru::Configuration.new(new_settings.clone))
+      allow(adapter2).to receive(:hostname).and_return('test2')
+      adapter2
+    }
+
+    it "removes stale worker keys" do
+      test1 = Gru::WorkerManager.new(adapter1)
+      test2 = Gru::WorkerManager.new(adapter2)
+      test1.register_workers
+      test2.register_workers
+      expect(client.hgetall("GRU:default:default:global:max_workers").keys).to eq(['foo_worker'])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gru
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jeffrey Gillis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis