work_shaper 0.1.2.5 → 0.1.2.7rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3486b765efce170ed99dd19dd25fe0b755e0c109c1f460ca2998f444cdf8557f
-  data.tar.gz: d9329ef84832dfbc0704a56f39ed82a8a51f17e3ebe93741938f4422cdb47797
+  metadata.gz: 227baf03a85cc1e631a5f55ecb5832504501828bea7b87435ac00b6944b44942
+  data.tar.gz: '003509444bbd9b6981c16adf4dfb7f8cab44c648715a26e4737aae3ad9bcc4c5'
 SHA512:
-  metadata.gz: 046bc8286d04fd48130621813262ea0537b8b68eec80fe6332658d46f09fe3ca4e5640d63f91b131e2f9774e286dbada92968d2e361feccabde139f91230ec41
-  data.tar.gz: 4851e8636d76ea5d5438f343527117dc6880d1e47a5de07c35d20ee469df474fbd103c5d73850dea6217c1ce3f5174c64acebe4faf2c27d2233aaa9031e7c7d1
+  metadata.gz: 926b0af454f94f5336161403278b7e4de3d6ba2399dc8692051ac7d1423750ca8b1a3f7614700cb2baffc5b1e07e420ea7d94c4b5e78b4b2f66d2687b7d8f83b
+  data.tar.gz: 6a6b92cf53395c4713d680e8468217633b8f5aead88c145c4b42dd523bad59e3600396f5ee059b43d31eedca6c28013c3ba972d70ff65533b8c2eac56ea527fd

data/lib/work_shaper/manager.rb

@@ -35,7 +35,7 @@ module WorkShaper
 
       @heartbeat = Thread.new do
         while true
-          report
+          report(detailed: true)
           sleep heartbeat_period_sec
         end
       rescue => e
@@ -134,19 +134,20 @@ module WorkShaper
     end
 
     def offset_ack_unsafe(partition)
-      completed = @completed_offsets[partition]
-      received = @received_offsets[partition]
+      completed = @completed_offsets[partition].sort
+      received = @received_offsets[partition].sort
 
-      offset = completed.sort.first
-      while received.any? && received.sort.first == offset
+      offset = completed.first
+      while received.any? && received.first == offset
         # 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.
         last_offset = @last_ack[partition]
         if last_offset && offset <= last_offset
           WorkShaper.logger.warn(
-            { message: 'Received Dupilcate Offset',
-              offset: "#{partition}:#{offset}"
+            { message: 'Received Duplicate Offset',
+              offset: "#{partition}:#{offset}",
+              last_acked: last_offset,
             })
         else
           result = @ack.call(partition, offset)
@@ -157,10 +158,9 @@ module WorkShaper
                 completed: @completed_offsets[partition].to_a[0..10].join(','),
                 received: @received_offsets[partition].to_a[0..10].join(',')
               })
-          else
-            @last_ack[partition] = offset
           end
         end
+        @last_ack[partition] = offset
 
         @total_acked += 1
         WorkShaper.logger.debug "@total_acked: #{@total_acked}"
@@ -175,11 +175,7 @@ module WorkShaper
 
     def pause_on_overrun
       overrun = lambda do
-        completed = @completed_offsets.values.flatten.count
-        received = @received_offsets.values.flatten.count
-
         @total_enqueued.to_i - @total_acked.to_i > @max_in_queue
-        received - completed > @max_in_queue
       end
 
       # We have to be careful here to avoid a deadlock. Another thread may be waiting

data/lib/work_shaper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WorkShaper
-  VERSION = "0.1.2.5"
+  VERSION = "0.1.2.7rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: work_shaper
 version: !ruby/object:Gem::Version
-  version: 0.1.2.5
+  version: 0.1.2.7rc2
 platform: ruby
 authors:
 - Jerry Fernholz
@@ -62,9 +62,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: