karafka 2.0.0.beta1 → 2.0.0.beta2

data/lib/karafka/server.rb

@@ -15,7 +15,7 @@ module Karafka
 
     class << self
       # Set of consuming threads. Each consumer thread contains a single consumer
-      attr_accessor :consumer_threads
+      attr_accessor :listeners
 
       # Set of workers
       attr_accessor :workers
@@ -25,9 +25,12 @@ module Karafka
 
       # Method which runs app
       def run
-        process.on_sigint { stop }
-        process.on_sigquit { stop }
-        process.on_sigterm { stop }
+        # Since we do a lot of threading and queuing, we don't want to stop from the trap context
+        # as some things may not work there as expected, that is why we spawn a separate thread to
+        # handle the stopping process
+        process.on_sigint { Thread.new { stop } }
+        process.on_sigquit { Thread.new { stop } }
+        process.on_sigterm { Thread.new { stop } }
 
         # Start is blocking until stop is called and when we stop, it will wait until
         # all of the things are ready to stop
@@ -35,6 +38,8 @@ module Karafka
 
         # We always need to wait for Karafka to stop here since we should wait for the stop running
         # in a separate thread (or trap context) to indicate everything is closed
+        # Since `#start` is blocking, we were get here only after the runner is done. This will
+        # not add any performance degradation because of that.
         Thread.pass until Karafka::App.stopped?
       # Try its best to shutdown underlying components before re-raising
       # rubocop:disable Lint/RescueException
@@ -70,16 +75,16 @@ module Karafka
       def stop
         Karafka::App.stop!
 
-        timeout = Thread.new { Karafka::App.config.shutdown_timeout }.join.value
+        timeout = Karafka::App.config.shutdown_timeout
 
         # We check from time to time (for the timeout period) if all the threads finished
         # their work and if so, we can just return and normal shutdown process will take place
         # We divide it by 1000 because we use time in ms.
         ((timeout / 1_000) * SUPERVISION_CHECK_FACTOR).to_i.times do
-          if consumer_threads.count(&:alive?).zero? &&
+          if listeners.count(&:alive?).zero? &&
              workers.count(&:alive?).zero?
 
-            Thread.new { Karafka::App.producer.close }.join
+            Karafka::App.producer.close
 
             return
           end
@@ -89,22 +94,18 @@ module Karafka
 
         raise Errors::ForcefulShutdownError
       rescue Errors::ForcefulShutdownError => e
-        thread = Thread.new do
-          Karafka.monitor.instrument(
-            'error.occurred',
-            caller: self,
-            error: e,
-            type: 'app.stopping.error'
-          )
-
-          # We're done waiting, lets kill them!
-          workers.each(&:terminate)
-          consumer_threads.each(&:terminate)
-
-          Karafka::App.producer.close
-        end
-
-        thread.join
+        Karafka.monitor.instrument(
+          'error.occurred',
+          caller: self,
+          error: e,
+          type: 'app.stopping.error'
+        )
+
+        # We're done waiting, lets kill them!
+        workers.each(&:terminate)
+        listeners.each(&:terminate)
+
+        Karafka::App.producer.close
 
         # exit! is not within the instrumentation as it would not trigger due to exit
         Kernel.exit! FORCEFUL_EXIT_CODE

data/lib/karafka/setup/config.rb

@@ -117,6 +117,7 @@ module Karafka
         def setup(&block)
           configure(&block)
           merge_kafka_defaults!(config)
+
           Contracts::Config.new.validate!(config.to_h)
 
           # Check the license presence (if needed) and

data/lib/karafka/version.rb

@@ -3,5 +3,5 @@
 # Main module namespace
 module Karafka
   # Current Karafka version
-  VERSION = '2.0.0.beta1'
+  VERSION = '2.0.0.beta2'
 end

data.tar.gz.sig

@@ -1,3 +1 @@
-Ό��vڹ��4�nS��[U+,��u�6�bC*@+���[�:$֒؞K�kw��(�gl��G� K����=Iҳ�N�2�OAoHP����P�mt�@�-$��ͧ 
{�Ӷ\gB����@��A�w�	�6j�agL�=;;84����$@{��BS�%�+��o��Z*���*��Оנ1Ie���ZQ�OL�Ӆ��bx`
-?��@�Ԕ��DA��+�[cT�"_t�J�M�aT0ʳ��F���U��
]���oIP�
C������勳������/,��R�NES-�����]R���
-��k`�gf��=���}�5Jk�y�-f�'��HQ.�C$�L��_B�A#^5ZA��⤋r����K���1)���2���h�
+S*^�w`��&qU��Lrӵ�w޺��� �"�q��U�W�QCˊ1a�����>��S��K����F��0���%=�7��Q����x�{��*p��z\�d�����	�VjL!;�b!��rzk�68Q�����fp&?8G'	.�_h{v�^`�.Y�Bl�C�t��fkJ��EGn�~��\pP����J�����Aߎ���<bC�䲼�f�UEB:�CD]'?�ɡ#E>"��1��mq�ʟl{gp�p��e}�i�Q�ё�O���f�Ao�פ����:��]�C��x�m��=$
f7�g.>/��j���?�rG��#lώ��$�Jh��c�no/
��#eB%Ғԇ���`,8֙�Ts�9|��O�p�~�P��	�6㌐��

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -34,7 +34,7 @@ cert_chain:
   R2P11bWoCtr70BsccVrN8jEhzwXngMyI2gVt750Y+dbTu1KgRqZKp/ECe7ZzPzXj
   pIy9vHxTANKYVyI4qj8OrFdEM5BQNu8oQpL0iQ==
   -----END CERTIFICATE-----
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -184,7 +184,7 @@ files:
 - lib/karafka/active_job/dispatcher.rb
 - lib/karafka/active_job/job_extensions.rb
 - lib/karafka/active_job/job_options_contract.rb
-- lib/karafka/active_job/routing_extensions.rb
+- lib/karafka/active_job/routing/extensions.rb
 - lib/karafka/app.rb
 - lib/karafka/base_consumer.rb
 - lib/karafka/cli.rb
@@ -195,8 +195,10 @@ files:
 - lib/karafka/cli/server.rb
 - lib/karafka/connection/client.rb
 - lib/karafka/connection/listener.rb
+- lib/karafka/connection/listeners_batch.rb
 - lib/karafka/connection/messages_buffer.rb
 - lib/karafka/connection/pauses_manager.rb
+- lib/karafka/connection/raw_messages_buffer.rb
 - lib/karafka/connection/rebalance_manager.rb
 - lib/karafka/contracts.rb
 - lib/karafka/contracts/base.rb
@@ -206,6 +208,7 @@ files:
 - lib/karafka/contracts/server_cli_options.rb
 - lib/karafka/env.rb
 - lib/karafka/errors.rb
+- lib/karafka/helpers/async.rb
 - lib/karafka/helpers/multi_delegator.rb
 - lib/karafka/instrumentation.rb
 - lib/karafka/instrumentation/callbacks/error.rb
@@ -225,10 +228,13 @@ files:
 - lib/karafka/messages/seek.rb
 - lib/karafka/patches/rdkafka/consumer.rb
 - lib/karafka/pro.rb
+- lib/karafka/pro/active_job/consumer.rb
 - lib/karafka/pro/active_job/dispatcher.rb
 - lib/karafka/pro/active_job/job_options_contract.rb
 - lib/karafka/pro/loader.rb
 - lib/karafka/pro/performance_tracker.rb
+- lib/karafka/pro/processing/jobs/consume_non_blocking.rb
+- lib/karafka/pro/scheduler.rb
 - lib/karafka/process.rb
 - lib/karafka/processing/executor.rb
 - lib/karafka/processing/executors_buffer.rb
@@ -248,6 +254,7 @@ files:
 - lib/karafka/routing/subscription_group.rb
 - lib/karafka/routing/subscription_groups_builder.rb
 - lib/karafka/routing/topic.rb
+- lib/karafka/routing/topics.rb
 - lib/karafka/runner.rb
 - lib/karafka/scheduler.rb
 - lib/karafka/serialization/json/deserializer.rb

data/lib/karafka/active_job/routing_extensions.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Karafka
-  # ActiveJob related Karafka stuff
-  module ActiveJob
-    # Routing extensions for ActiveJob
-    module RoutingExtensions
-      # This method simplifies routes definition for ActiveJob topics / queues by auto-injecting
-      # the consumer class
-      # @param name [String, Symbol] name of the topic where ActiveJobs jobs should go
-      def active_job_topic(name)
-        topic(name) do
-          consumer App.config.internal.active_job.consumer
-        end
-      end
-    end
-  end
-end