work_shaper 0.1.3.1rc4 → 0.1.3.1rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 883a72259f3ae672a2456139e8b309da4cb72be8ae36e85293a4dfc5a21ad502
-  data.tar.gz: 4fa2fc7b182c6865fd4d761548676a7ada9ae903264f76056d317d90bd7607e2
+  metadata.gz: b86b6e151780b23abcdeb4c148775a3344f2b41a0da426f9ff0da148eca1ea5a
+  data.tar.gz: 4af867aee488107d5e934fe02c844a4c2f0b6548305bea935bc8b32b143c2808
 SHA512:
-  metadata.gz: b4caa694ff8cf25082c05bea23b37254ff0d57bd6bbaa1b0a2eb081ceedca2c935dd395c3bfa01640d4ab635ab72535fc81d40d725cfe16ab933e1a8c367a0a5
-  data.tar.gz: 7106024e8f782582836661ad809dd3d033464cb6c2daa68c1e8e10764ea74eeffcf6b688cbdc9c43f93203e750bb3486bbbd24ac89cbbaffeec98a9808d9b5f1
+  metadata.gz: 8cb3139f6e36a665bbcfad2291c11d6e785c4c41df11ab8cc69b35111a5b897da12fe13ac6fc2f5cfac55a6673314256b4bd2215171c722ba6b7c3299ab77c2a
+  data.tar.gz: 8342797e7b562d0fd8be90c802a8d83c4e480c81311e4474a9e78ce911d7f83bb15dbbb01c63d4a1394b5b40dc6e7a5223d499eb0a505ba2538a9e4836eacce9

data/lib/work_shaper/manager.rb

@@ -25,7 +25,6 @@ module WorkShaper
       @workers = {}
       @last_ack = {}
       @received_offsets = {}
-      @completed_offsets = {}
       @max_in_queue = max_in_queue
       @semaphore = Mutex.new
       @shutting_down = false
@@ -45,7 +44,7 @@ module WorkShaper
 
       @offset_manager = Thread.new do
         while true
-          @completed_offsets.each_key do |partition|
+          @received_offsets.each_key do |partition|
             offset_ack(partition)
           end
           sleep offset_commit_period_ms / 1000.0
@@ -77,7 +76,6 @@ module WorkShaper
               method(:offset_ack),
               @on_error,
               @last_ack,
-              @completed_offsets,
               @semaphore,
               @max_in_queue
             )
@@ -91,7 +89,7 @@ module WorkShaper
     # the consumer restarts.
     def flush(safe: true)
       sleep 5
-      @completed_offsets.each_key do |k|
+      @received_offsets.each_key do |k|
         safe ? offset_ack(k) : offset_ack_unsafe(k)
       end
     end
@@ -137,12 +135,11 @@ module WorkShaper
     end
 
     def offset_ack_unsafe(partition)
-      completed = @completed_offsets[partition].sort!
       received = @received_offsets[partition].sort!
 
       begin
-        offset = completed.first
-        while received.any? && received.first == offset
+        offset = received.first
+        while offset && offset.completed?
           # We observed Kafka sending the same message twice, even after
           # having committed the offset. Here we skip this offset if we
           # know it has already been committed.
@@ -172,7 +169,6 @@ module WorkShaper
             WorkShaper.logger.warn(
               { message: 'Failed to Ack Offset, likely re-balance',
                 offset: "#{partition}:#{offset}",
-                completed: @completed_offsets[partition].to_a[0..10].join(','),
                 received: @received_offsets[partition].to_a[0..10].join(',')
               })
           else
@@ -181,12 +177,10 @@ module WorkShaper
 
           @total_acked += 1
           WorkShaper.logger.debug "@total_acked: #{@total_acked}"
-          WorkShaper.logger.debug "completed: [#{completed.join(', ')}]"
           WorkShaper.logger.debug "received: [#{received.join(', ')}]"
-          completed.delete(offset)
           received.delete(offset)
 
-          offset = completed.first
+          offset = received.first
         end
       rescue => e
         WorkShaper.logger.error({ message: 'Error in offset_ack', error: e })

data/lib/work_shaper/offset_holder.rb

@@ -24,14 +24,14 @@ module WorkShaper
 
       if r == 0
         r = STATES[state] <=> STATES[other.state]
-        puts "States: #{r} | #{STATES[state]} #{STATES[other.state]}"
+        WorkShaper.logger.debug "States: #{r} | #{STATES[state]} #{STATES[other.state]}"
       end
 
       if r == 0
         r = @at <=> other.instance_variable_get(:@at)
-        puts "At: #{r}"
+        WorkShaper.logger.debug "At: #{r}"
       end
-      puts "Final: #{r}"
+      WorkShaper.logger.debug "Final: #{r}"
       r
     end
 
@@ -43,6 +43,10 @@ module WorkShaper
       @state = :completed
     end
 
+    def completed?
+      @state == :completed
+    end
+
     def to_i
       offset
     end

data/lib/work_shaper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WorkShaper
-  VERSION = "0.1.3.1rc4"
+  VERSION = "0.1.3.1rc6"
 end

data/lib/work_shaper/worker.rb

@@ -6,14 +6,13 @@ module WorkShaper
     # @param work [Lambda] Lambda that we will #call(message) to execute work.
     # @param on_done [Lambda] Lambda that we #call(partition, offset) when work is done.
     # @param on_error [Lambda] Lambda that we #call(exception) if an error is encountered.
-    def initialize(work, on_done, ack_handler, on_error, last_ack, offset_stack, semaphore, max_in_queue)
+    def initialize(work, on_done, ack_handler, on_error, last_ack, semaphore, max_in_queue)
       @jobs = []
       @work = work
       @on_done = on_done
       @ack_handler = ack_handler
       @on_error = on_error
       @last_ack = last_ack
-      @completed_offsets = offset_stack
       @semaphore = semaphore
       @max_in_queue = max_in_queue
       @thread_pool = Concurrent::FixedThreadPool.new(1, auto_terminate: false)
@@ -38,7 +37,6 @@ module WorkShaper
         @semaphore.synchronize do
           WorkShaper.logger.debug "Completed: #{partition}:#{offset}"
           offset_holder.complete!
-          (@completed_offsets[partition] ||= Array.new) << offset_holder
         end
       end
       # rubocop:enable Style/RescueStandardError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_shaper
 version: !ruby/object:Gem::Version
-  version: 0.1.3.1rc4
+  version: 0.1.3.1rc6
 platform: ruby
 authors:
 - Jerry Fernholz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby