karafka 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adfb5654381a04d5b7111806bd5bbba70f75f02e7044b57af09b91b547dbd09
-  data.tar.gz: 9500da87035507a037218e9df5a11c8803e738c707b5d624c19559917939b689
+  metadata.gz: c2b67a18484b250b65788db213f615b7f1304ab33d6645bceeebdf8025b54bda
+  data.tar.gz: 27d4ece68701b9f34266ff834c9d0809690e06b108412f68916a39880a7a23f6
 SHA512:
-  metadata.gz: 1acb20378ecdf95b87378297de714f6791f5abd3d411fbda4701231912e30033163c3b81a21f98a99d2ca247dbbe8cda72d81efc7b1d83a3aa019485dd2e8604
-  data.tar.gz: 2a8d352d68852da005c87b0494457abf3559ec3975deb1098da233e16e4e33fed517020733300b2364ad650cc3764d59deb7fff6efe63e216e4fdb057c3e4ed8
+  metadata.gz: 682a0ff35d78e9eb5590bdb32bbc14bf47f18029003286d55d1f6f14425cd3d3ad6e8081a574f3f2146bc95d9ac692e9dc82622065e6dc6f092dc3dbe61652f3
+  data.tar.gz: 5a4e68ea639b9261172c055e6f22a741735262eb277acd18e465c862ead0242d0287b8872d6add290af0bba681f000a328f4c16d1ee31ca9075fe880552ddf9b

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Karafka framework changelog
 
+## 2.0.2 (2022-08-07)
+- Bypass issue with Rails reload in development by releasing the connection (https://github.com/rails/rails/issues/44183).
+
 ## 2.0.1 (2022-08-06)
 - Provide `Karafka::Admin` for creation and destruction of topics and fetching cluster info.
 - Update integration specs to always use one-time disposable topics.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    karafka (2.0.1)
+    karafka (2.0.2)
       karafka-core (>= 2.0.2, < 3.0.0)
       rdkafka (>= 0.12)
       thor (>= 0.20)

data/lib/karafka/admin.rb

@@ -8,7 +8,7 @@ module Karafka
   #
   # @note It always uses the primary defined cluster and does not support multi-cluster work.
   #   If you need this, just replace the cluster info for the time you use this
-  class Admin
+  module Admin
     class << self
       # Creates Kafka topic with given settings
       #

data/lib/karafka/instrumentation/notifications.rb

@@ -34,6 +34,7 @@ module Karafka
 
         worker.process
         worker.processed
+        worker.completed
 
         statistics.emitted
 

data/lib/karafka/processing/worker.rb

@@ -46,8 +46,9 @@ module Karafka
       def process
         job = @jobs_queue.pop
 
+        instrument_details = { caller: self, job: job, jobs_queue: @jobs_queue }
+
         if job
-          instrument_details = { caller: self, job: job, jobs_queue: @jobs_queue }
 
           Karafka.monitor.instrument('worker.process', instrument_details)
 
@@ -82,6 +83,9 @@ module Karafka
       ensure
         # job can be nil when the queue is being closed
         @jobs_queue.complete(job) if job
+
+        # Always publish info, that we completed all the work despite its result
+        Karafka.monitor.instrument('worker.completed', instrument_details)
       end
     end
   end

data/lib/karafka/railtie.rb

@@ -77,6 +77,16 @@ if rails
 
           Rails.application.reloader.reload!
         end
+
+        ::Karafka::App.monitor.subscribe('worker.completed') do
+          # Skip in case someone is using Rails without ActiveRecord
+          next unless Object.const_defined?('ActiveRecord::Base')
+
+          # Always release the connection after processing is done. Otherwise thread may hang
+          # blocking the reload and further processing
+          # @see https://github.com/rails/rails/issues/44183
+          ActiveRecord::Base.connection_pool.release_connection
+        end
       end
 
       initializer 'karafka.require_karafka_boot_file' do |app|

data/lib/karafka/version.rb

@@ -3,5 +3,5 @@
 # Main module namespace
 module Karafka
   # Current Karafka version
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -34,7 +34,7 @@ cert_chain:
   R2P11bWoCtr70BsccVrN8jEhzwXngMyI2gVt750Y+dbTu1KgRqZKp/ECe7ZzPzXj
   pIy9vHxTANKYVyI4qj8OrFdEM5BQNu8oQpL0iQ==
   -----END CERTIFICATE-----
-date: 2022-08-06 00:00:00.000000000 Z
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: karafka-core