resque-cluster 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 449ba4c6b761fb949dac265d136d9da9cb3c148d
-  data.tar.gz: 6ab65355b8afcbcef3a3afcf21916ebb4d911b39
+  metadata.gz: b8d180c93a32868cb57d270286bd124aaf24bab1
+  data.tar.gz: d12d96cb26be32e27adac81faa1b73362479a01b
 SHA512:
-  metadata.gz: b671b486cc3b8a21614ce99b0ef7c60173274c801ef232726409d77483d618e35f8e7080f0fd3ae9ac45b715597369a34019a12d710b98b3e5435f9d49fdabd1
-  data.tar.gz: eb7060908cf8408d45987d98c4cc0fb382f378c2de60c2e8b69fb066007e81bc57c212bd692738636004a71e3c4b6ab8f7701f99e4384fff7cbdb94dbf07831f
+  metadata.gz: 2b6170bedb0e3be27ab31e8692be4e377a1cc941b4f1d70dddd58b8eeb318825f808c5fde6796cd478b63820d014cbd832554bfb8099d2fbe9558df98beafe6c
+  data.tar.gz: 7c596a869b51618f4483e77526466f204f7cb2062acb2cd709de244eb294a9c20082b22f0befe5b8c1f3ed7f9c85cd35e5ecd0a5b216c3ac251954cfd3e76284

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'resque-pool', '~> 0.5.0'
-gem 'gru', '0.0.5'
+gem 'gru', '0.0.8'
 
 group :development do
   gem 'pry'

data/Gemfile.lock

@@ -23,7 +23,7 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
-    gru (0.0.5)
+    gru (0.0.8)
       redis (> 0.0)
     hashie (3.4.1)
     highline (1.7.2)
@@ -121,7 +121,7 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   bundler (~> 1.0)
-  gru (= 0.0.5)
+  gru (= 0.0.8)
   jeweler (~> 2.0.1)
   mock_redis (~> 0.15.0)
   pry

data/lib/resque/cluster/member.rb

@@ -51,12 +51,16 @@ module Resque
         "#{member_prefix}:running_workers"
       end
 
+      def ping_namespace
+        global_prefix + ":pings"
+      end
+
       def ping
-        Resque.redis.hset(global_prefix, hostname, Time.now.utc)
+        Resque.redis.hset(ping_namespace, hostname, Time.now.utc)
       end
 
       def unping
-        Resque.redis.hdel(global_prefix, hostname)
+        Resque.redis.hdel(ping_namespace, hostname)
       end
 
       def initialize_gru
@@ -108,7 +112,8 @@ module Resque
           client_settings:  Resque.redis.client.options,
           rebalance_flag:   @global_config["rebalance_cluster"] || false,
           cluster_name:     Cluster.config[:cluster_name],
-          environment_name: Cluster.config[:environment]
+          environment_name: Cluster.config[:environment],
+          presume_host_dead_after: @global_config["presume_dead_after"] || 120
         }
       end
     end

data/lib/resque/cluster/version.rb

@@ -1,5 +1,5 @@
 module Resque
   class Cluster
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/resque-cluster.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency  'resque-pool', '~> 0.5.0'
-  s.add_dependency  'gru', '0.0.5'
+  s.add_dependency  'gru', '0.0.8'
 
   s.add_development_dependency 'pry', '> 0.0'
   s.add_development_dependency 'awesome_print', '> 0.0'

data/spec/integration/cluster_spec.rb

@@ -5,6 +5,7 @@ GLOBAL_CONFIG = "spec/integration/config/global_config.yml"
 LOCAL_CONFIG2 = "spec/integration/config/local_config2.yml"
 GLOBAL_CONFIG2 = "spec/integration/config/global_config2.yml"
 GLOBAL_REBALANCE_CONFIG2 = "spec/integration/config/global_rebalance_config2.yml"
+GLOBAL_CONFIG3 = "spec/integration/config/global_config3.yml"
 
 RSpec.describe "Resque test-cluster" do
   context "Spin Up and Down" do
@@ -178,4 +179,44 @@ RSpec.describe "Resque test-cluster" do
     end
   end
 
+  context "In case one member gets reaped, the cluster rebalances after assuming a member dead" do
+    before :all do
+      sleep 5
+      @a = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG3)
+      @b = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG3)
+      @c = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG3)
+    end
+
+    it 'expects no workers to be running' do
+      expect(TestMemberManager.counts).to be_empty
+      expect(@a.counts).to be_empty
+      expect(@b.counts).to be_empty
+      expect(@c.counts).to be_empty
+    end
+
+    it 'expects counts to be correct after workers get spun up' do
+      @a.start
+      @b.start
+      @c.start
+      expect(TestMemberManager.counts).to eq({"par"=>2, "tar"=>8, "par,tar,var"=>1})
+    end
+
+    it 'cluster adjusts correctly when a member gets reaped' do
+      @a.kill
+      sleep(10)
+      expect(TestMemberManager.counts).to eq({"tar"=>6, "par"=>2, "par,tar,var"=>1})
+      expect(@a.counts).to be_empty
+    end
+
+    it 'cluster rebalances correctly when the member gets brought back up' do
+      @a.start
+      expect(TestMemberManager.counts).to eq({"par"=>2, "tar"=>8, "par,tar,var"=>1})
+    end
+
+    after :all do
+      TestMemberManager.stop_all
+    end
+
+  end
+
 end

data/spec/integration/config/global_config3.yml

@@ -0,0 +1,5 @@
+global_maximums:
+  par: 2
+  tar: 8
+  "par,tar,var": 1
+presume_dead_after: 10

data/spec/integration/test_member_manager.rb

@@ -33,6 +33,17 @@ class TestMemberManager
     sleep(5)
   end
 
+  def kill
+    puts "************************************************ About to kill -9 : Pool Master pid ---------- #{@pool_master_pid}"
+    `kill -9 #{@pool_master_pid}`
+    while ( @pool_master_pid ) do
+      pool = `ps -p #{@pool_master_pid} -hf | grep 'resque-pool-master\\[resque-cluster\\]: managing \\[' | awk '{print $1}'`.strip.to_i
+      @pool_master_pid = pool > 0 ? pool : nil
+    end
+    @pid = nil
+    sleep(5)
+  end
+
   def counts
     return {} unless @pool_master_pid
     local_workers = `ps --ppid #{@pool_master_pid} -fh | awk '{print $8}'`.split

data/spec/unit/member_spec.rb

@@ -27,6 +27,7 @@ RSpec.describe Resque::Cluster::Member do
         :host_maximums => {'foo' => 1, 'bar' => 9, "foo,bar,baz" => 1},
         :client_settings => @redis.client.options,
         :rebalance_flag => false,
+        :presume_host_dead_after => 120,
         :cluster_name => "unit-test-cluster",
         :environment_name => "unit-test"
       }
@@ -51,7 +52,7 @@ RSpec.describe Resque::Cluster::Member do
     end
 
     it 'pings into redis to let the rest of the cluster know of it' do
-      expect(@redis.hget('resque:cluster:unit-test-cluster:unit-test', @@hostname)).to_not be_nil
+      expect(@redis.hget('resque:cluster:unit-test-cluster:unit-test:pings', @@hostname)).to_not be_nil
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yasha Portnoy
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +194,7 @@ files:
 - spec/integration/cluster_spec.rb
 - spec/integration/config/global_config.yml
 - spec/integration/config/global_config2.yml
+- spec/integration/config/global_config3.yml
 - spec/integration/config/global_rebalance_config2.yml
 - spec/integration/config/local_config.yml
 - spec/integration/config/local_config2.yml
@@ -236,6 +237,7 @@ test_files:
 - spec/integration/cluster_spec.rb
 - spec/integration/config/global_config.yml
 - spec/integration/config/global_config2.yml
+- spec/integration/config/global_config3.yml
 - spec/integration/config/global_rebalance_config2.yml
 - spec/integration/config/local_config.yml
 - spec/integration/config/local_config2.yml