switchman-inst-jobs 3.2.8 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4023807a9b569aff8d1751ded026466f0e135b8eae0c6ad9ff7bd80a1a7f818
-  data.tar.gz: 8a61cde9444723e15b3ec0c6034791e1887972a572755fea1e72b87fe004ec7d
+  metadata.gz: 4f4d9ba9513be35bfcc25eb4273305aea1474ed42299bd7a45675cf6476e4eb1
+  data.tar.gz: 7d2222fa91a0a3ad4f5d19bb8705b118b909608608b29b2188e0d45bfad30f1e
 SHA512:
-  metadata.gz: 0a947509044626f1ccebbd8c1ec34db74e0086dd3df8f8ef7a6b3dfbc6c616bb76a3832cf3a168191b954d1241586bacf8a7909bbeb3a7be1eec21eb3426865e
-  data.tar.gz: fb103f3ec6eff9c2b356f592f133c8eaae99b08487623b3d0aee257f1cb1215620d66824eb221ec745abc96e9c19fdcb5c254bd5bffec78bfcd283d9cd2b9745
+  metadata.gz: b9fd01c47c6d4c9a4556a41a53bdcf54c43c8f1d1ce25109decafbf2ee3bf4b4fa155e3c284ecb4cbf3d5a52b99eff2fc08aa743bf73bb9c0eb93cb4e63c4f03
+  data.tar.gz: 919c31f442cd5eb1cbeb6fb1669b20f6abeec5f1c58d9fb0b3dedb978d3ae66a9fd2d9f1f7195f6fec79982c02f1510ae686a0c55397c32dac5666270e4bc27d

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -100,7 +100,7 @@ module SwitchmanInstJobs
         #    those (= do nothing since it should already be false)
         # 4) no running job, jobs moved: set next_in_strand=true on the first of
         #    those (= do nothing since it should already be true)
-        handler = lambda { |scope, column, blocker_job_kwargs = {}|
+        handler = lambda { |scope, column, blocker_job_kwargs = {}, advisory_lock_cb = nil|
           shard_map = build_shard_map(scope, source_shard)
           shard_map.each do |(target_shard, source_shard_ids)|
             shard_scope = scope.where(shard_id: source_shard_ids)
@@ -111,6 +111,10 @@ module SwitchmanInstJobs
             target_shard.activate(:delayed_jobs) do
               values.each do |value|
                 transaction_on([source_shard, target_shard]) do
+                  source_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+                    advisory_lock_cb&.call(value)
+                  end
+
                   value_scope = shard_scope.where(**{ column => value })
                   # we want to copy all the jobs except the one that is still running.
                   jobs_scope = value_scope.where(locked_by: nil)
@@ -151,9 +155,21 @@ module SwitchmanInstJobs
         singleton_scope = ::Delayed::Job.shard(source_shard).where('strand IS NULL AND singleton IS NOT NULL')
         all_scope = ::Delayed::Job.shard(source_shard).where('strand IS NOT NULL OR singleton IS NOT NULL')
 
-        handler.call(strand_scope, :strand)
-        handler.call(singleton_scope, :singleton,
-                     { locked_at: DateTime.now, locked_by: ::Delayed::Backend::Base::ON_HOLD_BLOCKER })
+        singleton_blocker_additional_kwargs = {
+          locked_at: DateTime.now,
+          locked_by: ::Delayed::Backend::Base::ON_HOLD_BLOCKER
+        }
+
+        strand_advisory_lock_fn = lambda do |value|
+          ::Delayed::Job.connection.execute("SELECT pg_advisory_xact_lock(half_md5_as_bigint('#{value}'))")
+        end
+
+        singleton_advisory_lock_fn = lambda do |value|
+          ::Delayed::Job.connection.execute("SELECT pg_advisory_xact_lock(half_md5_as_bigint('singleton:#{value}'))")
+        end
+
+        handler.call(strand_scope, :strand, {}, strand_advisory_lock_fn)
+        handler.call(singleton_scope, :singleton, singleton_blocker_additional_kwargs, singleton_advisory_lock_fn)
 
         shard_map = build_shard_map(all_scope, source_shard)
         shard_map.each do |(target_shard, source_shard_ids)|

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '3.2.8'.freeze
+  VERSION = '3.2.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.2.9
 platform: ruby
 authors:
 - Bryan Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs