resque-cluster 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c483198ba655c6b6a01d9e5bf12bc94c78d7b97
-  data.tar.gz: 2ba5e136b052f24b10e034caa4b6dbb25faafb54
+  metadata.gz: fc8ed9831d6ca9e37cffd6b8307a99d46e244c98
+  data.tar.gz: 43aa29967bd118a139a252fdab27bc5415b0aa30
 SHA512:
-  metadata.gz: e179193ae5214b87436aef62b1af2193153894f6f9e9d39980d3b110d8d364635771c8e925d8db12886432e1790986d6b6bbf1cb515e3a4eac67eed87996e590
-  data.tar.gz: 9c5502109e773a4869e565f11d5d28bc279bebb8a425de6f6ddd907e3d98c7e96dbfa6693ef2ae97ecce21f3995813268f959934520c007d6684b164b344fbcd
+  metadata.gz: bbcdcba1bd2556726b9cda6ecb186be4b5b99bc6b3b5ee0190f1b31692dc9ac83cac5499c7bd1318d2d40356e62b0710245781bd67750c2da9e78826514affa0
+  data.tar.gz: 743b31b2c4fe8ecf48525c4f18f71604ea83b275457d7cef1e869e334cdbdb9b656de142a324c60b654d339cd7010ea1530a3f8273760bb4c525d4da170d1265

data/Gemfile.lock

@@ -12,7 +12,7 @@ GEM
     ast (2.3.0)
     awesome_print (1.7.0)
     builder (3.2.2)
-    coderay (1.1.1)
+    byebug (9.0.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
@@ -42,7 +42,6 @@ GEM
       rdoc
     json (1.8.3)
     jwt (1.5.4)
-    method_source (0.8.2)
     mini_portile2 (2.1.0)
     mono_logger (1.1.0)
     multi_json (1.12.1)
@@ -61,10 +60,6 @@ GEM
       ast (~> 2.2)
     pkg-config (1.1.7)
     powerpack (0.1.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack
@@ -113,7 +108,6 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    slop (3.6.0)
     sys-proctable (1.1.1)
     thread_safe (0.3.5)
     tilt (2.0.5)
@@ -128,9 +122,9 @@ PLATFORMS
 DEPENDENCIES
   awesome_print (> 0.0)
   bundler (~> 1.7)
+  byebug (> 0.0)
   ffi
   jeweler (~> 2.0.1)
-  pry (> 0.0)
   rdoc (~> 3.12)
   resque-cluster!
   rspec (~> 3.1.0)

data/lib/resque/cluster/config.rb

@@ -38,7 +38,7 @@ module Resque
         {
           manage_worker_heartbeats: true,
           host_maximums:            host_maximums,
-          client_settings:          Resque.redis.client.options,
+          client_settings:          gru_redis_connection,
           cluster_name:             Cluster.config[:cluster_name],
           environment_name:         Cluster.config[:environment],
           cluster_maximums:         cluster_maximums,
@@ -70,6 +70,19 @@ module Resque
 
       private
 
+      def gru_redis_connection
+        case config_type
+        when :separate
+          global_config['redis_client_options'] ||
+            Resque.redis.client.options
+        when :old
+          Resque.redis.client.options
+        when :new
+          config['redis_client_options'] ||
+            Resque.redis.client.options
+        end
+      end
+
       def complete_worker_config?
         host_keys    = Set.new(host_maximums.delete_if { |_, v| v.nil? }.keys)
         cluster_keys = Set.new(cluster_maximums.delete_if { |_, v| v.nil? }.keys)

data/lib/resque/cluster/version.rb

@@ -1,5 +1,5 @@
 module Resque
   class Cluster
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/resque-cluster.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency  'resque-pool', '~> 0.5.0'
   s.add_dependency  'gru', '0.1.3'
 
-  s.add_development_dependency 'pry', '> 0.0'
+  s.add_development_dependency 'byebug', '> 0.0'
   s.add_development_dependency 'awesome_print', '> 0.0'
   s.add_development_dependency 'rspec', '~> 3.1.0'
   s.add_development_dependency 'rdoc', '~> 3.12'

data/spec/global_rebalance_config.yml

@@ -3,3 +3,6 @@ global_maximums:
   bar: 50
   "foo,bar,baz": 1
 rebalance_cluster: true
+redis_client_options:
+  host: "127.0.0.1"
+  port: 6378

data/spec/integration/cluster_spec.rb

@@ -115,9 +115,9 @@ RSpec.describe "Resque test-cluster" do
 
   context "Multiple Clusters and Environments" do
     before :all do
-      @a = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG)
-      @b = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG, "test1-cluster")
-      @c = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG, "test-cluster", "test1")
+      @a = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG3)
+      @b = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG3, "test1-cluster")
+      @c = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG3, "test-cluster", "test1")
       @a.start
       @b.start
       @c.start
@@ -138,8 +138,8 @@ RSpec.describe "Resque test-cluster" do
 
   context "Rebalance after global maximums change" do
     before :all do
-      @a = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG)
-      @b = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG)
+      @a = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG3)
+      @b = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_CONFIG3)
       @c = TestMemberManager.new(LOCAL_CONFIG, GLOBAL_REBALANCE_CONFIG3)
       @a.start
       @b.start
@@ -172,13 +172,19 @@ RSpec.describe "Resque test-cluster" do
       @b = TestMemberManager.new(LOCAL_CONFIG2, GLOBAL_CONFIG2)
       @c = TestMemberManager.new(LOCAL_CONFIG2, GLOBAL_REBALANCE_CONFIG2)
       @a.start
+      @a_ping = @a.last_gru_ping
       @b.start
+      @b_ping = @b.last_gru_ping
       @c.start
+      @c_ping = @c.last_gru_ping
       sleep(5) # rebalance time
     end
 
     it 'expects to have a correct number of workers in the cluster after multiple restarts' do
       expect(TestMemberManager.counts).to eq({"star"=>12})
+      expect(@a.last_gru_ping).to be > @a_ping
+      expect(@b.last_gru_ping).to be > @b_ping
+      expect(@c.last_gru_ping).to be > @c_ping
       2.times do
         sleep(5)
         @a.stop
@@ -190,11 +196,20 @@ RSpec.describe "Resque test-cluster" do
         @c.stop
         @c.start
       end
+      @a_ping = @a.last_gru_ping
+      @b_ping = @b.last_gru_ping
+      @c_ping = @c.last_gru_ping
       sleep(8) # rebalance time
       expect(TestMemberManager.counts).to eq({"star"=>12})
       expect(@a.counts).to eq({"star"=>4})
       expect(@b.counts).to eq({"star"=>4})
       expect(@c.counts).to eq({"star"=>4})
+      expect(@a.last_gru_ping).to be > @a_ping
+      expect(@b.last_gru_ping).to be > @b_ping
+      expect(@c.last_gru_ping).to be > @c_ping
+      @a_ping = @a.last_gru_ping
+      @b_ping = @b.last_gru_ping
+      @c_ping = @c.last_gru_ping
     end
 
     it 'will not rebalance after the cluster is switched to rebalance-cluster false' do
@@ -202,6 +217,9 @@ RSpec.describe "Resque test-cluster" do
       sleep(2)
       @b.start
       sleep(8)
+      expect(@a.last_gru_ping).to be > @a_ping
+      expect(@b.last_gru_ping).to be > @b_ping
+      expect(@c.last_gru_ping).to be > @c_ping
       expect(TestMemberManager.counts).to eq({"star"=>12})
       expect(@a.counts).to eq({"star"=>6})
       expect(@b.counts).to eq({})

data/spec/integration/config/global_config3.yml

@@ -3,3 +3,6 @@ global_maximums:
   tar: 8
   "par,tar,var": 1
 presume_dead_after: 10
+redis_client_options:
+  host: "127.0.0.1"
+  port: 6378

data/spec/integration/config/global_rebalance_config3.yml

@@ -3,3 +3,6 @@ global_maximums:
   par: 4
   tar: 6
   "par,tar,var": 2
+redis_client_options:
+  host: "127.0.0.1"
+  port: 6378 

data/spec/integration/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'pry'
+require 'byebug'
 require 'rspec'
 require 'sys/proctable'
 require 'resque'

data/spec/integration/test_member_manager.rb

@@ -1,5 +1,6 @@
 class TestMemberManager
   include Sys
+  require 'resque/cluster/config'
 
   attr_accessor :pid
 
@@ -90,6 +91,14 @@ class TestMemberManager
     @hostname ||= "#{Socket.gethostname}-#{member_count+1}"
   end
 
+  def last_gru_ping
+    redis_connection.hget("GRU:#{@environment}:#{@cluster_name}:heartbeats", hostname).to_i
+  end
+
+  def redis_connection
+    @redis_connection ||= Redis.new
+  end
+
   def self.parse_worker_name(worker_cmdline)
     worker_cmdline.gsub(/resque(\d|\.|-)*:\sWaiting\sfor\s/, '')
   end

data/spec/unit/config_spec.rb

@@ -131,6 +131,34 @@ RSpec.describe Resque::Cluster::Config do
       end
     end
 
+    context "with separate redis config in config files" do
+      let(:config)             { Resque::Cluster::Config.new(local_config_path, global_config_path) }
+      let(:local_config_path)  { File.expand_path(File.dirname(__FILE__) + '/../local_config.yml') }
+      let(:global_config_path) { File.expand_path(File.dirname(__FILE__) + '/../global_rebalance_config.yml') }
+
+      let(:correct_hash) do
+        {
+          cluster_maximums:         { 'foo' => 2, 'bar' => 50, "foo,bar,baz" => 1 },
+          host_maximums:            { 'foo' => 1, 'bar' => 9, "foo,bar,baz" => 1 },
+          client_settings:          {"host"=>"127.0.0.1", "port"=>6378},
+          rebalance_flag:           true,
+          presume_host_dead_after:  120,
+          max_workers_per_host:     nil,
+          cluster_name:             "unit-test-cluster",
+          environment_name:         "unit-test",
+          manage_worker_heartbeats: true
+        }
+      end
+
+      it_behaves_like 'a valid config'
+
+      it "config should have no warnings or errors" do
+        expect(config.errors.count).to eql(0)
+        expect(config.warnings.count).to eql(0)
+      end
+    end
+
+
     context 'with a missing local maximum' do
       let(:config)             { Resque::Cluster::Config.new(local_config_path, global_config_path) }
       let(:local_config_path)  { support_dir + 'separate_missing_local.yml' }

data/spec/unit/spec_helper.rb

@@ -1,5 +1,5 @@
 gem 'resque-pool'
-require 'pry'
+require 'byebug'
 require 'resque/pool/cli'
 require 'rspec'
 require 'socket'

data/spec/unit/support/valid_global_separate_redis_config.yml

@@ -0,0 +1,16 @@
+rebalance_cluster: true
+max_workers_per_host: 10
+presume_dead_after: 60
+workers:
+  foo:
+    local: 1
+    global: 2
+  bar:
+    local: 9
+    global: 50
+  "foo,bar,baz":
+    local: 1
+    global: 1
+redis_client_options:
+  host: "127.0.0.1"
+  port: 6378

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-cluster
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Yasha Portnoy
@@ -14,14 +14,14 @@ dependencies:
   name: resque-pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
@@ -39,143 +39,143 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: byebug
   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'
 - !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: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !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: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.31'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.31'
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A management tool for resque workers. Allows spinning up and managing
@@ -186,10 +186,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .rubocop.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -240,6 +240,7 @@ files:
 - spec/unit/support/single_old_missing_local.yml
 - spec/unit/support/valid_config.yml
 - spec/unit/support/valid_global_config.yml
+- spec/unit/support/valid_global_separate_redis_config.yml
 - spec/unit/support/valid_local_config.yml
 - spec/unit/support/valid_single_new_config.yml
 - spec/unit/support/valid_single_old_config.yml
@@ -253,17 +254,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.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Creates and manages resque worker in a distributed cluster
@@ -303,6 +304,7 @@ test_files:
 - spec/unit/support/single_old_missing_local.yml
 - spec/unit/support/valid_config.yml
 - spec/unit/support/valid_global_config.yml
+- spec/unit/support/valid_global_separate_redis_config.yml
 - spec/unit/support/valid_local_config.yml
 - spec/unit/support/valid_single_new_config.yml
 - spec/unit/support/valid_single_old_config.yml