resqued 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d56c813a2d3adf7d10fe76dafefff24c263f9766
-  data.tar.gz: e3c9cd5fc92aca0b70d4d8ed31de6f15c418c94c
+SHA256:
+  metadata.gz: 477007ffc7e6d2630b794ef021d1bbe2bc4f2cc5fc5df95fbd91b92f2e6121fe
+  data.tar.gz: 39531525a5afdd44ab077f69355d5b17a615f6430c21171bbd8cddc36adbaf66
 SHA512:
-  metadata.gz: a28be514424a281b554224c78ba0d4fa6ff328f1d9fff622c76653c09ceefc6bc6c70cdb389d41dbd566fa202741d073ad6817103d2231237cbfdd726dd32473
-  data.tar.gz: 14375d125a0c9e89ecc1918fa6d46f062206ddc0ac08a3ac8f504e7aeab563f90ea3d62cb54b955b1408f3308692b9cc98479c19d2d420b0136d73c10182687d
+  metadata.gz: e0f13ad32bc91c04058201882a00a65d4f67da7f3fadd19cac227eaca76d1816b47987f517a53d2ec03de9c39b3ff2c7ed6b2956e44ff0890cea0eb467085adc
+  data.tar.gz: 6c8399d793a329ae717d18c38dfca7e1f5b286e218e6ae39b5ce9deaed26b12a325d7e49292f5687a5ecb1e3814360fe9d5c6b670e0a5d49ed01473b978008c4

data/CHANGES.md

@@ -1,5 +1,10 @@
 Starting with version 0.6.1, resqued uses semantic versioning to indicate incompatibilities between the master process, listener process, and configuration.
 
+v0.10.1
+-------
+* Avoid deadlock if a listener stops responding. (#58)
+* When using 'percent' for a queue in a worker pool, always assign at least one worker. (#57)
+
 v0.10.0
 -------
 * Master process restarts itself (#51), so that it doesn't continue running stale code indefinitely. This will help with the rollout process when changes like #50 are introduced, so that the master process will catch up. The risk of this is that the master process might not be able to be restarted, which would lead to it crashing. The mostly likely way for that to happen is if you try to roll back your version of resqued to 0.9.0 or earlier. If you need to do that, ensure that your process monitor (systemd, god, etc.) is able to restart the master process. You can disable the new behavior by passing `--no-exec-on-hup`.

data/lib/resqued/config/worker.rb

@@ -112,7 +112,7 @@ module Resqued
         elsif value.is_a?(1.class)
           value < @pool_size ? value : @pool_size
         elsif value.is_a?(Float) && value >= 0.0 && value <= 1.0
-          (@pool_size * value).to_i
+          [(@pool_size * value).to_i, 1].max
         else
           raise TypeError, "Unknown concurrency value: #{value.inspect}"
         end

data/lib/resqued/listener.rb

@@ -85,6 +85,8 @@ module Resqued
 
       write_procline("shutdown")
       burn_down_workers(exit_signal || :QUIT)
+      @socket.close
+      @socket = nil
     end
 
     # Private.

data/lib/resqued/listener_proxy.rb

@@ -99,7 +99,10 @@ module Resqued
     def worker_finished(pid)
       return if @state.master_socket.nil?
 
-      @state.master_socket.puts(pid)
+      @state.master_socket.write_nonblock("#{pid}\n")
+    rescue IO::WaitWritable
+      log "Couldn't tell #{@state.pid} that #{pid} exited!"
+      # Ignore it, maybe the next time it'll work.
     rescue Errno::EPIPE
       @state.master_socket.close
       @state.master_socket = nil

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = "0.10.0".freeze
+  VERSION = '0.10.1'
 end

data/spec/resqued/backoff_spec.rb

@@ -6,7 +6,7 @@ describe Resqued::Backoff do
   let(:backoff) { described_class.new(min: 0.5, max: 64.0) }
 
   it "can start on the first try" do
-    expect(backoff.wait?).to be_false
+    expect(backoff.wait?).to be_falsey
   end
 
   it "has no waiting at first" do
@@ -15,42 +15,42 @@ describe Resqued::Backoff do
 
   context "after expected exits" do
     before { 3.times { backoff.started } }
-    it { expect(backoff.wait?).to be_true }
+    it { expect(backoff.wait?).to be true }
     it { expect(backoff.how_long?).to be_close_to(0.5) }
   end
 
   context "after one quick exit" do
     before { 1.times { backoff.started; backoff.died } }
-    it { expect(backoff.wait?).to be_true }
+    it { expect(backoff.wait?).to be true }
     it { expect(backoff.how_long?).to be_close_to(1.0) }
   end
 
   context "after two quick starts" do
     before { 2.times { backoff.started; backoff.died } }
-    it { expect(backoff.wait?).to be_true }
+    it { expect(backoff.wait?).to be true }
     it { expect(backoff.how_long?).to be_close_to(2.0) }
   end
 
   context "after five quick starts" do
     before { 6.times { backoff.started; backoff.died } }
-    it { expect(backoff.wait?).to be_true }
+    it { expect(backoff.wait?).to be true }
     it { expect(backoff.how_long?).to be_close_to(32.0) }
   end
 
   context "after six quick starts" do
     before { 7.times { backoff.started; backoff.died } }
-    it { expect(backoff.wait?).to be_true }
+    it { expect(backoff.wait?).to be true }
     it { expect(backoff.how_long?).to be_close_to(64.0) }
   end
 
   context "does not wait longer than 64s" do
     before { 8.times { backoff.started; backoff.died } }
-    it { expect(backoff.wait?).to be_true }
+    it { expect(backoff.wait?).to be true }
     it { expect(backoff.how_long?).to be_close_to(64.0) }
     it "and resets after an expected exit" do
       backoff.started
       backoff.started
-      expect(backoff.wait?).to be_true
+      expect(backoff.wait?).to be true
       expect(backoff.how_long?).to be_close_to(0.5)
     end
   end

data/spec/resqued/config/worker_spec.rb

@@ -55,6 +55,17 @@ describe Resqued::Config::Worker do
     end
   end
 
+  context "small pool with percent" do
+    let(:config) { <<-END_CONFIG }
+      worker_pool 2
+      queue "a"
+      queue "b", :percent => 45
+    END_CONFIG
+    it { expect(result.size).to eq(2) }
+    it { expect(result[0]).to eq(queues: ["a", "b"]) }
+    it { expect(result[1]).to eq(queues: ["a"]) }
+  end
+
   context "pool (hash for concurrency)" do
     let(:config) { <<-END_CONFIG }
       before_fork { }

data/spec/resqued/test_case_spec.rb

@@ -7,8 +7,8 @@ describe Resqued::TestCase do
   context "LoadConfig" do
     let(:the_module) { described_class::LoadConfig }
     it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_clean.rb"              }.not_to raise_error }
-    it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_before_fork_raises.rb" }.to     raise_error }
-    it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_after_fork_raises.rb"  }.to     raise_error }
+    it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_before_fork_raises.rb" }.to     raise_error(RuntimeError) }
+    it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_after_fork_raises.rb"  }.to     raise_error(RuntimeError) }
     it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_no_workers.rb"         }.not_to raise_error }
   end
 end

data/spec/support/custom_matchers.rb

@@ -11,6 +11,10 @@ module CustomMatchers
       @epsilon = 0.01
     end
 
+    def supports_block_expectations?
+      true
+    end
+
     def within(epsilon)
       @epsilon = epsilon
       self
@@ -24,9 +28,13 @@ module CustomMatchers
       @epsilon >= diff
     end
 
-    def failure_message_for_should
+    def failure_message
       "Expected block to run for #{@expected_duration} +/-#{@epsilon} seconds, but it ran for #{@actual_duration} seconds."
     end
+
+    def failure_message_when_negated
+      "Expected block not to run for #{@expected_duration} +/-#{@epsilon} seconds, but it ran for #{@actual_duration} seconds."
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -56,36 +56,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -172,24 +166,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Daemon of resque workers
 test_files:
-- spec/resqued/sleepy_spec.rb
-- spec/resqued/backoff_spec.rb
-- spec/resqued/config/worker_spec.rb
-- spec/resqued/config/fork_event_spec.rb
-- spec/resqued/start_ctx_spec.rb
-- spec/resqued/config_spec.rb
-- spec/resqued/test_case_spec.rb
 - spec/spec_helper.rb
+- spec/test_restart.sh
+- spec/support/custom_matchers.rb
+- spec/fixtures/test_case_clean.rb
 - spec/fixtures/test_case_before_fork_raises.rb
 - spec/fixtures/test_case_environment.rb
 - spec/fixtures/test_case_no_workers.rb
 - spec/fixtures/test_case_after_fork_raises.rb
-- spec/fixtures/test_case_clean.rb
-- spec/test_restart.sh
-- spec/support/custom_matchers.rb
+- spec/resqued/config_spec.rb
+- spec/resqued/config/fork_event_spec.rb
+- spec/resqued/config/worker_spec.rb
+- spec/resqued/sleepy_spec.rb
+- spec/resqued/test_case_spec.rb
+- spec/resqued/start_ctx_spec.rb
+- spec/resqued/backoff_spec.rb