inst-jobs 0.14.7 → 0.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a80182a2c2ba0fbaa7ccd9e88a092f171c724c9e9fa01db2081d8ec00e03474
-  data.tar.gz: 1edd56027ef8cade2e9012945d3ec144d50b5315fc42867aed05179c4c9cbe05
+  metadata.gz: 200abc70c1bf8ecf6e041c76a5db366c6000895de24fa71c8af52924e206bd7a
+  data.tar.gz: 368611347a87da497e65fb2a190c1b4d1597ffb22bd985c7e2e9602c637516b5
 SHA512:
-  metadata.gz: f9726d3b6c5f47a7510e97ba00661c690f1c3dbb06219289fc3fca8ce11898cc99fd348cf222ac2ceab4bbc4e1c79b3cd9dcba606a5b39cf38346fe1fd5fdab3
-  data.tar.gz: 3056b193ca321a6c1db7e6e438538ceef74690fec95c7134cc9e21832eb4fea1cad884d2d9c69558fac562a7e725c9eb7acf1c3d2eec31d9ad87e387d09ebf5c
+  metadata.gz: 0beb49ab68860f4366b7d8e2863404a9d95d1fc03713cec9cd58ff192f8e4ecc7ea1207a58d8bac2ae672e616d227b0aa8b81c4ef83f3a02c8cd097e2ed68c94
+  data.tar.gz: 66779ae928d0e08b745d5cf50e559dff0ff7b4b833ebbf6be036ef6e5a8111622c8d887695ab646abce6e1afd953ddb9980d5434e10a2c2197fbb777f31e7b53

data/lib/delayed/backend/active_record.rb

@@ -343,6 +343,11 @@ module Delayed
           end
         end
 
+        def self.processes_locked_locally(name: nil)
+          name ||= Socket.gethostname rescue x
+          where("locked_by LIKE ?", "#{name}:%").pluck(:locked_by).map{|locked_by| locked_by.split(":").last.to_i}
+        end
+
         def self.unlock_orphaned_prefetched_jobs
           horizon = db_time_now - Settings.parent_process[:prefetched_jobs_timeout] * 4
           where("locked_by LIKE 'prefetch:%' AND locked_at<?", horizon).update_all(locked_at: nil, locked_by: nil)

data/lib/delayed/backend/base.rb

@@ -118,6 +118,11 @@ module Delayed
           Time.now.utc
         end
 
+        def processes_locked_locally(name: nil)
+          name ||= Socket.gethostname rescue x
+          running_jobs.select{|job| job.locked_by.start_with?("#{name}:")}.map{|job| job.locked_by.split(':').last.to_i}
+        end
+
         def unlock_orphaned_prefetched_jobs
           horizon = db_time_now - Settings.parent_process[:prefetched_jobs_timeout] * 4
           orphaned_jobs = running_jobs.select { |job| job.locked_by.start_with?('prefetch:') && job.locked_at < horizon }

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.14.7"
+  VERSION = "0.14.8"
 end

data/lib/delayed/worker/consul_health_check.rb

@@ -1,4 +1,5 @@
 require_relative 'health_check'
+require_relative 'process_helper'
 require 'socket'
 
 module Delayed
@@ -10,31 +11,6 @@ module Delayed
       DEFAULT_SERVICE_NAME = 'inst-jobs_worker'.freeze
       attr_reader :agent_client, :catalog_client
 
-      STAT_LINUX = 'stat -f %%Y /proc/$WORKER_PID'
-      STAT_MAC = 'ps -o lstart -p $WORKER_PID'
-      STAT = RUBY_PLATFORM =~ /darwin/ ? STAT_MAC : STAT_LINUX
-      ALIVE_CHECK_LINUX = '[ -d "/proc/$WORKER_PID" ]'
-      ALIVE_CHECK_MAC = 'ps -p $WORKER_PID > /dev/null'
-      ALIVE_CHECK = RUBY_PLATFORM =~ /darwin/ ? ALIVE_CHECK_MAC : ALIVE_CHECK_LINUX
-      SCRIPT_TEMPLATE = <<-BASH.freeze
-        WORKER_PID="%<pid>d" # an example, filled from ruby when the check is created
-        ORIGINAL_MTIME="%<mtime>s" # an example, filled from ruby when the check is created
-
-        if #{ALIVE_CHECK}; then
-            CURRENT_MTIME=$(#{STAT})
-
-            if [ "$ORIGINAL_MTIME" = "$CURRENT_MTIME" ]; then
-                exit 0 # Happy day
-            else
-                echo "PID still exists but procfs entry has changed, current command:"
-                ps -p $WORKER_PID -o 'command='
-                exit 1 # Something is wrong, trigger a "warning" state
-            fi
-        else
-            exit 255 # The process is no more, trigger a "critical" state.
-        fi
-      BASH
-
       def initialize(*args)
         super
         # Because we don't want the consul client to be a hard dependency we're
@@ -94,12 +70,8 @@ module Delayed
 
       def check_script
         return @check_script if @check_script
-        if RUBY_PLATFORM =~ /darwin/
-          mtime = `ps -o lstart -p #{Process.pid}`.sub(/\n$/, '')
-        else
-          mtime = File::Stat.new("/proc/#{Process.pid}").mtime.to_i.to_s
-        end
-        @check_script = sprintf(SCRIPT_TEMPLATE, {pid: Process.pid, mtime: mtime})
+        mtime = ProcessHelper.mtime(Process.pid)
+        @check_script = ProcessHelper.check_script(Process.pid, mtime)
       end
 
       # This method is horrible, it takes advantage of the fact that docker uses

data/lib/delayed/worker/process_helper.rb

@@ -0,0 +1,47 @@
+module Delayed
+  class Worker
+    module ProcessHelper
+
+      STAT_LINUX = 'stat --format=%%Y /proc/$WORKER_PID'
+      STAT_MAC = 'ps -o lstart -p $WORKER_PID'
+      STAT = RUBY_PLATFORM =~ /darwin/ ? STAT_MAC : STAT_LINUX
+      ALIVE_CHECK_LINUX = '[ -d "/proc/$WORKER_PID" ]'
+      ALIVE_CHECK_MAC = 'ps -p $WORKER_PID > /dev/null'
+      ALIVE_CHECK = RUBY_PLATFORM =~ /darwin/ ? ALIVE_CHECK_MAC : ALIVE_CHECK_LINUX
+      SCRIPT_TEMPLATE = <<-BASH.freeze
+        WORKER_PID="%<pid>d" # an example, filled from ruby when the check is created
+        ORIGINAL_MTIME="%<mtime>s" # an example, filled from ruby when the check is created
+
+        if #{ALIVE_CHECK}; then
+            CURRENT_MTIME=$(#{STAT})
+
+            if [ "$ORIGINAL_MTIME" = "$CURRENT_MTIME" ]; then
+                exit 0 # Happy day
+            else
+                echo "PID still exists but procfs entry has changed, current command:"
+                ps -p $WORKER_PID -o 'command='
+                exit 1 # Something is wrong, trigger a "warning" state
+            fi
+        else
+            exit 255 # The process is no more, trigger a "critical" state.
+        fi
+      BASH
+
+      def self.mtime(pid)
+        if RUBY_PLATFORM =~ /darwin/
+          `ps -o lstart -p #{pid}`.sub(/\n$/, '').presence
+        else
+          File::Stat.new("/proc/#{pid}").mtime.to_i.to_s rescue nil
+        end
+      end
+
+      def self.check_script(pid, mtime)
+        sprintf(SCRIPT_TEMPLATE, {pid: pid, mtime: mtime})
+      end
+
+      def self.process_is_still_running?(pid, mtime)
+        system(self.check_script(pid, mtime))
+      end
+    end
+  end
+end

data/spec/active_record_job_spec.rb

@@ -261,6 +261,13 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     expect(Delayed::Job.find(job2.id).locked_by).to eq 'prefetch:a'
   end
 
+  it "gets process ids from locked_by" do
+    3.times.map { Delayed::Job.create :payload_object => SimpleJob.new }
+    locked_jobs = Delayed::Job.get_and_lock_next_available(['job42:2', 'job42:9001'])
+    expect(Delayed::Job.processes_locked_locally(name: 'job42').sort).to eq [2, 9001]
+    expect(Delayed::Job.processes_locked_locally(name: 'jobnotme')).to be_empty
+  end
+
   it "allows fetching multiple jobs at once" do
     jobs = 3.times.map { Delayed::Job.create :payload_object => SimpleJob.new }
     locked_jobs = Delayed::Job.get_and_lock_next_available(['worker1', 'worker2'])

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rack/test'
 require 'test_after_commit' if ::Rails.version < '5'
 require 'timecop'
 require 'pry'
+require 'byebug'
 
 RSpec.configure do |config|
 
@@ -55,6 +56,14 @@ if ::Rails.version < '5'
   end
 end
 
+def migrate(file)
+  if ::Rails.version < '5.2'
+    ActiveRecord::Migrator.migrate(file)
+  else
+    ActiveRecord::MigrationContext.new(file).migrate
+  end
+end
+
 # create the test db if it does not exist, to help out wwtd
 ActiveRecord::Base.establish_connection(connection_config.merge(database: 'postgres'))
 begin
@@ -64,8 +73,8 @@ end
 ActiveRecord::Base.establish_connection(connection_config)
 # TODO reset db and migrate again, to test migrations
 
-ActiveRecord::Migrator.migrate("db/migrate")
-ActiveRecord::Migrator.migrate("spec/migrate")
+migrate("db/migrate")
+migrate("spec/migrate")
 Delayed::Backend::ActiveRecord::Job.reset_column_information
 Delayed::Backend::ActiveRecord::Job::Failed.reset_column_information
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.14.7
+  version: 0.14.8
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -390,6 +390,7 @@ files:
 - lib/delayed/worker/consul_health_check.rb
 - lib/delayed/worker/health_check.rb
 - lib/delayed/worker/null_health_check.rb
+- lib/delayed/worker/process_helper.rb
 - lib/delayed/yaml_extensions.rb
 - lib/delayed_job.rb
 - lib/inst-jobs.rb