gru 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f81004c4b58b3e0ea77782860d61b34c54f9fa0c
-  data.tar.gz: bda6fe97420101c9fe889632d630a41d71b681d3
+  metadata.gz: 13495796cf42eb14f84201efe3ff4701a3a4b2e5
+  data.tar.gz: d965fb4d6e6003907e3b4253a6741c0d93549b1e
 SHA512:
-  metadata.gz: 2ff2308c6f18d1accb1c30ca5a4120584b381a7d50e9fb4f326532f9152ea68ec56e052089ca76e0c6c4a78359e4fa9c14b6e739fa289962e3cb89c288ae5e79
-  data.tar.gz: 9b8bc8ad57bb6ba68aa0e0605f1153cd846c52394e1aabfa67143e140ee0486a35f78ff03313239e8341b11e361af2b0c1f29a4794e9d190e5c03a3185e2b338
+  metadata.gz: faa6fec2b08740761f6a436ad5fba23586cd4ead30a3c7f45814b66180e2cfc4de738a834c2a1eab51b5710fa79c701b146937448c759f8f5a7ee871fccfa9e9
+  data.tar.gz: b369f35ebec7200cfae1ff6b02fb7f079a05f440648b575245bf8eb6f7a0982a06668b44872c466c0d5d5312d8976547234a7869a0ccb4685ce4b184044b2f96

data/lib/gru/adapters/redis_adapter.rb

@@ -123,12 +123,16 @@ module Gru
       end
 
       def remove_dead_host_workers_from_counts(hostname)
-        workers_running_on_dead_host = send_message(:hgetall, "#{gru_key}:#{hostname}:workers_running")
-        workers_running_on_dead_host.each_pair do |worker_name, count|
-          send_message(:hincrby,"#{gru_key}:#{hostname}:workers_running",worker_name,Integer(count)*-1)
-          send_message(:hincrby,global_workers_running_key,worker_name,Integer(count)*-1)
+        lock_key = "#{gru_key}:#{hostname}"
+        if send_message(:setnx,lock_key,Time.now.to_i)
+          workers_running_on_dead_host = send_message(:hgetall, "#{gru_key}:#{hostname}:workers_running")
+          workers_running_on_dead_host.each_pair do |worker_name, count|
+            send_message(:hincrby,"#{gru_key}:#{hostname}:workers_running",worker_name,Integer(count)*-1)
+            send_message(:hincrby,global_workers_running_key,worker_name,Integer(count)*-1)
+          end
+          send_message(:del,lock_key)
+          send_message(:hdel,resque_cluster_pings_key,hostname)
         end
-        send_message(:hdel,resque_cluster_pings_key,hostname)
       end
 
       def reset_removed_global_worker_counts(workers)
@@ -198,12 +202,17 @@ module Gru
       end
 
       def worker_counts(worker)
-        @client.multi do |multi|
+        counts = @client.multi do |multi|
           multi.hget(host_workers_running_key,worker)
           multi.hget(global_workers_running_key,worker)
           multi.hget(host_max_worker_key,worker)
           multi.hget(global_max_worker_key,worker)
         end
+        if counts[1].to_i <0
+          make_global_workers_count_non_negative(worker)
+          counts[1] = send_message(:hget, global_workers_running_key, worker)
+        end
+        counts
       end
 
       def presumed_dead_cluster_members
@@ -228,6 +237,10 @@ module Gru
         send_message(:get,"#{gru_key}:rebalance") == "true"
       end
 
+      def make_global_workers_count_non_negative(worker)
+        send_message(:hset, global_workers_running_key, worker, 0)
+      end
+
       def presume_host_dead_after
         dead_after_number_of_seconds = send_message(:get,"#{gru_key}:presume_host_dead_after").to_i
         dead_after_number_of_seconds > 0 ? dead_after_number_of_seconds : 120

data/lib/gru/version.rb

@@ -1,3 +1,3 @@
 module Gru
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

data/spec/gru/adapters/redis_adapter_spec.rb

@@ -79,7 +79,9 @@ describe Gru::Adapters::RedisAdapter do
       end
 
       it "returns workers with 0 existing workers" do
-        expect(client).to receive(:multi).exactly(3).times.and_yield(client).and_return([0,0,3,3])
+        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(:get).with("#{gru_key}:rebalance").exactly(3).times
@@ -151,6 +153,7 @@ describe Gru::Adapters::RedisAdapter do
         available_workers = adapter.provision_workers
         expect(available_workers).to eq({'test_worker' => 0})
       end
+
     end
   end
 

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: gru
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Jeffrey Gillis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.0'
 description: This is a worker/minion manager using different atomic data stores.
@@ -101,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -125,21 +125,20 @@ 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.4.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An atomic worker/minion manager.
 test_files:
 - spec/gru/adapters/redis_adapter_spec.rb
 - spec/gru/worker_manager_spec.rb
-has_rdoc: