perfectqueue 0.8.54 → 0.9.0

data/spec/supervisor_spec.rb

@@ -3,23 +3,15 @@ require 'spec_helper'
 class TestHandler < PerfectQueue::Application::Base
   def run
     #puts "TestHandler: #{task}"
-    if task.data['raise_error']
-      raise "expected error test"
-    end
     if num = task.data['sleep']
       sleep num
     end
     #puts "Task finished"
   end
-
-  def kill(reason)
-    puts "kill: #{reason.class}: #{reason}"
-  end
 end
 
 class RegexpHandler < PerfectQueue::Application::Base
   def run
-    puts "RegexpHandler: #{task}"
   end
 end
 

data/spec/task_monitor_spec.rb

@@ -18,8 +18,6 @@ describe PerfectQueue::TaskMonitor do
       tm = PerfectQueue::TaskMonitor.new(logger: double('logger').as_null_object)
       task = double('task')
       reason = double('reason')
-      allow(task).to receive_message_chain(:runner, :kill) \
-        .with(no_args).with(reason){raise}
       epoch = double('epoch')
       allow(Time).to receive_message_chain(:now, :to_i){epoch}
       ret = double('ret')
@@ -30,7 +28,7 @@ describe PerfectQueue::TaskMonitor do
   end
 
   describe '#run' do
-    it 'rescues exception' do
+    it 'rescues unknown error' do
       config = {logger: double('logger').as_null_object}
       force_stop = double('force_stop')
       expect(force_stop).to receive(:call).with(no_args).exactly(:once)
@@ -39,21 +37,29 @@ describe PerfectQueue::TaskMonitor do
       tm.run
     end
   end
+
+  describe '#task_heartbeat' do
+    let (:tm){ PerfectQueue::TaskMonitor.new(logger: double('logger').as_null_object) }
+    let (:err){ StandardError.new('heartbeat preempted') }
+    before do
+      task = double('task')
+      allow(task).to receive(:heartbeat!){ raise err }
+      tm.set_task(task, double('runner'))
+    end
+    it 'calls kill_task($!) on heartbeat error' do
+      expect(tm).to receive(:kill_task).with(err).exactly(:once)
+      tm.__send__(:task_heartbeat)
+    end
+  end
 end
 
 describe PerfectQueue::TaskMonitorHook do
-  let (:task_monitor) do
-    tm = PerfectQueue::TaskMonitor.new(logger: double('logger').as_null_object)
-  end
   let (:task) do
-    obj = double('task', key: 'foo', finish!: 1, release!: 1, retry!: 1, cancel_request!: 1, update_data!: 1)
-    obj.extend(TaskMonitorHook)
-    obj.instance_variable_set(:@log, double('log', info: nil))
-    obj.instance_variable_set(:@task_monitor, task_monitor)
+    obj = AcquiredTask.new(double(:client).as_null_object, 'key', {}, double)
+    tm = TaskMonitor.new(logger: double('logger').as_null_object)
+    tm.set_task(obj, double('runner'))
     obj
   end
-  before do
-  end
   describe 'finish!' do
     it { task.finish! }
   end
@@ -63,10 +69,7 @@ describe PerfectQueue::TaskMonitorHook do
   describe 'retry!' do
     it { task.retry! }
   end
-  describe 'cancel_request!' do
-    it { task.cancel_request! }
-  end
   describe 'update_data!' do
-    it { task.update_data!(double) }
+    it { task.update_data!({}) }
   end
 end

data/spec/worker_spec.rb

@@ -0,0 +1,222 @@
+require 'spec_helper'
+
+describe PerfectQueue::Worker do
+  let (:worker){ Worker.new(double, {}) }
+
+  describe '.run' do
+    let (:runner){ double }
+    let (:config){ double }
+    let (:worker){ double }
+    context 'with config' do
+      it 'calls Worker.new.run' do
+        expect(worker).to receive(:run).with(no_args).exactly(:once)
+        allow(Worker).to receive(:new).with(runner, config).and_return(worker)
+        Worker.run(runner, config)
+      end
+    end
+    context 'with block' do
+      it 'calls Worker.new.run' do
+        expect(worker).to receive(:run).with(no_args).exactly(:once)
+        allow(Worker).to receive(:new).with(runner, nil).and_return(worker)
+        Worker.run(runner)
+      end
+    end
+  end
+
+  describe '.new' do
+    context 'with config' do
+      it 'returns a worker' do
+        expect(Worker.new(double, {})).to be_an_instance_of(Worker)
+      end
+      it 'has @detach_wait which is 10.0' do
+        worker = Worker.new(double, {})
+        expect(worker.instance_variable_get(:@detach_wait)).to eq(10.0)
+      end
+      it 'has @detach_wait which is configured by config[:detach_wait]' do
+        detach_wait = double
+        worker = Worker.new(double, {detach_wait: detach_wait})
+        expect(worker.instance_variable_get(:@detach_wait)).to eq(detach_wait)
+      end
+    end
+    context 'with block' do
+      it 'returns a worker' do
+        expect(Worker.new(double){ {} }).to be_an_instance_of(Worker)
+      end
+    end
+  end
+
+  describe '#run' do
+    before do
+      allow(worker).to receive(:install_signal_handlers)
+      allow(worker.instance_variable_get(:@sv)).to receive(:run){sleep 1}
+    end
+    context 'normal and detach' do
+      it do
+        pid = double
+        waitpid2_ret = nil
+        allow(worker).to receive(:fork).and_return(pid)
+        allow(Process).to receive(:kill).with(:INT, pid) do
+          waitpid2_ret = [pid, double]
+        end
+        allow(Process).to receive(:waitpid2).and_return(waitpid2_ret)
+        Thread.new{sleep 0.5;worker.detach}
+        worker.run
+      end
+    end
+    context 'wrong pid' do
+      it 'ignores error and finish' do
+        wrong_pid = $$ # pid of myself is not suitable for waitpid2 and raise ECHILD
+        allow(worker).to receive(:fork).and_return(wrong_pid)
+        expect{ worker.run }.not_to raise_error
+      end
+    end
+    context 'child process side' do
+      it 'run supervisor and exit!' do
+        e = StandardError.new
+        allow(worker).to receive(:fork).and_yield
+        allow(worker.instance_variable_get(:@sv)).to receive(:run)
+        allow(worker).to receive(:exit!).exactly(:once){raise e}
+        expect{ worker.run }.to raise_error(e)
+      end
+    end
+  end
+
+  describe '#stop' do
+    let (:worker){ Worker.new(double, {}) }
+    context 'immediate=true' do
+      it 'send_signal(:QUIT)' do
+        expect(worker).to receive(:send_signal).with(:QUIT)
+        worker.stop(true)
+      end
+    end
+    context 'immediate=false' do
+      it 'send_signal(:TERM)' do
+        expect(worker).to receive(:send_signal).with(:TERM)
+        worker.stop(false)
+      end
+    end
+  end
+
+  describe '#restart' do
+    let (:worker){ Worker.new(double, {}) }
+    context 'immediate=true' do
+      it 'send_signal(:HUP)' do
+        expect(worker).to receive(:send_signal).with(:HUP)
+        worker.restart(true)
+      end
+    end
+    context 'immediate=false' do
+      it 'send_signal(:USR1)' do
+        expect(worker).to receive(:send_signal).with(:USR1)
+        worker.restart(false)
+      end
+    end
+  end
+
+  describe '#logrotated' do
+    it 'send_signal(:USR2)' do
+      expect(worker).to receive(:send_signal).with(:USR2)
+      worker.logrotated
+    end
+  end
+
+  describe '#detach' do
+    it 'send_signal(:INT) and so on' do
+      expect(worker).to receive(:send_signal).with(:INT)
+      expect(worker.instance_variable_get(:@finish_flag)).to receive(:set!).with(no_args)
+      worker.detach
+      expect(worker.instance_variable_get(:@detach)).to be true
+    end
+  end
+
+  describe '#send_signal' do
+    let (:sig){ double }
+    let (:pid){ double }
+    before do
+      worker.instance_variable_set(:@pid, pid)
+    end
+    context 'normal' do
+      it 'kill the process' do
+        allow(Process).to receive(:kill).with(sig, pid)
+        worker.__send__(:send_signal, sig)
+      end
+    end
+    context 'ESRCH' do
+      it 'ignores ESRCH' do
+        allow(Process).to receive(:kill).with(sig, pid).and_raise(Errno::ESRCH)
+        worker.__send__(:send_signal, sig)
+      end
+    end
+    context 'EPERM' do
+      it 'ignores EPERM' do
+        allow(Process).to receive(:kill).with(sig, pid).and_raise(Errno::EPERM)
+        worker.__send__(:send_signal, sig)
+      end
+    end
+  end
+
+  describe '#install_signal_handlers' do
+    let (:signal_thread){ worker.__send__(:install_signal_handlers) }
+    before do
+      signal_thread
+    end
+    after do
+      signal_thread.stop
+      signal_thread.value
+      trap :TERM, 'DEFAULT'
+      trap :INT, 'DEFAULT'
+      trap :QUIT, 'DEFAULT'
+      trap :USR1, 'DEFAULT'
+      trap :HUP, 'DEFAULT'
+      trap :USR2, 'DEFAULT'
+    end
+    context 'TERM' do
+      it 'call #stop(false)' do
+        flag = false
+        expect(worker).to receive(:stop).with(false){flag = true}
+        Process.kill(:TERM, $$)
+        10.times{sleep 0.1;break if flag}
+      end
+    end
+    context 'INT' do
+      it 'call #detach' do
+        flag = false
+        expect(worker).to receive(:detach).with(no_args){flag = true}
+        Process.kill(:INT, $$)
+        10.times{sleep 0.1;break if flag}
+      end
+    end
+    context 'QUIT' do
+      it 'call #stop(true)' do
+        flag = false
+        expect(worker).to receive(:stop).with(true){flag = true}
+        Process.kill(:QUIT, $$)
+        10.times{sleep 0.1;break if flag}
+      end
+    end
+    context 'USR1' do
+      it 'call #restart(false)' do
+        flag = false
+        expect(worker).to receive(:restart).with(false){flag = true}
+        Process.kill(:USR1, $$)
+        10.times{sleep 0.1;break if flag}
+      end
+    end
+    context 'HUP' do
+      it 'call #restart(true)' do
+        flag = false
+        expect(worker).to receive(:restart).with(true){flag = true}
+        Process.kill(:HUP, $$)
+        10.times{sleep 0.1;break if flag}
+      end
+    end
+    context 'USR2' do
+      it 'call #logrotated' do
+        flag = false
+        expect(worker).to receive(:logrotated).with(no_args){flag = true}
+        Process.kill(:USR2, $$)
+        10.times{sleep 0.1;break if flag}
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.54
+  version: 0.9.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -88,7 +88,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gitignore"
 - ".travis.yml"
 - ChangeLog
@@ -99,6 +98,7 @@ files:
 - Rakefile
 - bin/perfectqueue
 - bin/stress
+- circle.yml
 - lib/perfectqueue.rb
 - lib/perfectqueue/application.rb
 - lib/perfectqueue/application/base.rb
@@ -157,6 +157,7 @@ files:
 - spec/task_metadata_spec.rb
 - spec/task_monitor_spec.rb
 - spec/task_spec.rb
+- spec/worker_spec.rb
 homepage: https://github.com/treasure-data/perfectqueue
 licenses:
 - Apache 2.0
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Highly available distributed cron built on RDBMS
@@ -208,3 +209,4 @@ test_files:
 - spec/task_metadata_spec.rb
 - spec/task_monitor_spec.rb
 - spec/task_spec.rb
+- spec/worker_spec.rb

data/.circleci/config.yml

@@ -1,19 +0,0 @@
-version: 2.1
-
-executors:
-  executor-circle:
-    docker:
-      - image: buildpack-deps:jessie
-    working_directory: /tmp
-
-jobs:
-  build:
-    executor: executor-circle
-    steps:
-      - run: echo "It has used Travis instead of CircleCI."
-
-workflows:
-  version: 2
-  build_and_test:
-    jobs:
-      - build