pgbus 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 479168f8521b550bb2b786766ac630374cb80de0afb9e2e26afe87a9585b466c
-  data.tar.gz: a6c28faae035eebd4eb925d66b2914e50112728b648eaefc79473a5ff8c1513c
+  metadata.gz: 2fb58fdb0a36d1e0b4f4834cca266aa8771a2fa8c9419bb5aaa7e2a2e83c4725
+  data.tar.gz: 4b9fe002b753689046de0833c8d1112da0cf03c43a6bf2a050df989a76653bb3
 SHA512:
-  metadata.gz: 8c8dc58764091199f12b11befacf8f218038e2f09226350b52c625ea953751a25d39d3c28e74088fb9df19fe0f7b87a055b16cd380a5dae7618198ab35dda430
-  data.tar.gz: 5a76fa6870bd3b207da626b4a8e5317d38470e4d2447cfbb20fa01faafe88eb23156d5a3ecb0ef309b758f41a8222ee8c80fe38ec66599f5239c951b4de82325
+  metadata.gz: 397c99fe5da35f6e75720c27c9b1e002ce744720cadba773166674a8bf86eb88ca2151c63bfa0c042eff7ff9f2f5d7026c9d344e655f63f9a93f268f47f1225a
+  data.tar.gz: 33f98b8663e708d44ae5936a37fbeb3ca7966b80f358f9713d86b71ac95390a4eca0ab88c5faf2c008a203d8a88a43cdc0f73809bf2b95baadacfdc36e0a11a3

data/lib/pgbus/configuration.rb

@@ -106,7 +106,8 @@ module Pgbus
                   :streams_write_deadline_ms, :streams_falcon_streaming_body,
                   :streams_stats_enabled, :streams_test_mode,
                   :streams_orphan_sweep_interval, :streams_orphan_threshold,
-                  :streams_durable_patterns
+                  :streams_durable_patterns,
+                  :streams_host, :streams_port, :streams_database_url
     attr_reader :streams_default_broadcast_mode # rubocop:disable Style/AccessorGrouping
 
     # AppSignal integration (auto-loaded when ::Appsignal is defined and this is true).
@@ -193,6 +194,22 @@ module Pgbus
       @streams_enabled = true
       @streams_path = nil
       @streams_queue_prefix = "pgbus_stream"
+      # Streamer-only connection overrides. The Streamer's Listener owns a
+      # dedicated long-lived `wait_for_notify` PG connection that can't go
+      # through a PgBouncer in transaction mode (LISTEN/NOTIFY don't survive
+      # transaction-pool COMMIT boundaries — see PlanetScale's docs). Setting
+      # any of these overrides only the Streamer's connection options; the
+      # worker, dispatcher, and client publish paths keep using the regular
+      # `database_url` / `connection_params` (typically pooled).
+      #
+      #   streams_host          — override host only
+      #   streams_port          — override port only (most common case:
+      #                           pooler is on 6432, direct is 5432)
+      #   streams_database_url  — full URL override; takes precedence over
+      #                           the host/port surgicals when set
+      @streams_host = nil
+      @streams_port = nil
+      @streams_database_url = nil
       @streams_signed_name_secret = nil
       @streams_default_retention = 5 * 60 # 5 minutes
       @streams_retention = {}
@@ -608,6 +625,43 @@ module Pgbus
       end
     end
 
+    # Connection options the Streamer's dedicated LISTEN/NOTIFY PG connection
+    # should use. Defaults to `connection_options` (same as workers and the
+    # publish path). If any of `streams_database_url`, `streams_host`, or
+    # `streams_port` is set, the Streamer's connection is reconfigured —
+    # everything else keeps using the base options.
+    #
+    # The typical use is "workers go through PgBouncer, streamer goes direct":
+    #
+    #   c.connects_to = { database: { writing: :pgbus } }   # pooler
+    #   c.streams_port = 5432                               # direct
+    #
+    # Precedence: streams_database_url > streams_host/port override > base.
+    def streams_connection_options
+      return streams_database_url if streams_database_url
+
+      base = connection_options
+      return base unless streams_host || streams_port
+
+      case base
+      when Hash
+        result = base.dup
+        result[:host] = streams_host if streams_host
+        result[:port] = streams_port if streams_port
+        result
+      when String
+        # libpq's conninfo parser takes later key=value pairs as overrides
+        # for earlier ones, so we just append. Handles both URI form
+        # (postgres://...) and key=value form.
+        parts = [base]
+        parts << "host=#{streams_host}" if streams_host
+        parts << "port=#{streams_port}" if streams_port
+        parts.join(" ")
+      else
+        base
+      end
+    end
+
     private
 
     # Coerce a duration setting value to a positive Numeric.

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.8.2"
+  VERSION = "0.8.4"
 end

data/lib/pgbus/web/streamer/instance.rb

@@ -145,7 +145,7 @@ module Pgbus
 
         def build_pg_connection
           require "pg" unless defined?(::PG::Connection)
-          opts = @config.connection_options
+          opts = @config.streams_connection_options
           case opts
           when String then ::PG.connect(opts)
           when Hash   then ::PG.connect(**opts)

data/lib/pgbus/web/streamer/stream_event_dispatcher.rb

@@ -131,21 +131,16 @@ module Pgbus
             msg = @queue.pop
             break if msg == :__stop__
 
-            # Wake coalescing: if a WakeMessage arrives, opportunistically
-            # drain consecutive same-stream wakes from the queue. Without
-            # this, N broadcasts in rapid succession produce N
-            # WakeMessages, each running its own read_after roundtrip
-            # even though one read_after with the lowest cursor would
-            # have pulled all N messages. The drain is bounded by the
-            # queue's current contents — once we hit a non-Wake or a
-            # different stream, we stop and let the regular path handle
-            # the rest.
-            if msg.is_a?(WakeMessage) && msg.payload.nil?
-              wakes, trailing = drain_wakes_for(msg)
-              wakes.each { |w| handle(w) }
-              handle(trailing) if trailing
-            else
-              handle(msg)
+            begin
+              if msg.is_a?(WakeMessage) && msg.payload.nil?
+                wakes, trailing = drain_wakes_for(msg)
+                wakes.each { |w| handle(w) }
+                handle(trailing) if trailing
+              else
+                handle(msg)
+              end
+            ensure
+              release_ar_connections
             end
           end
         rescue StandardError => e
@@ -483,6 +478,19 @@ module Pgbus
         # if operators actually look at it. All failures are
         # swallowed by StreamStat.record! itself so a stats-table
         # outage cannot block the dispatcher.
+        # Release any AR connections the dispatcher fiber acquired during
+        # this iteration (typically from StreamStat.record! via BusRecord).
+        # Without this, the connection stays leased while the fiber parks
+        # on @queue.pop, blocking clear_reloadable_connections! on the
+        # next Rails code reload (10s wedge under rack-timeout).
+        def release_ar_connections
+          return unless defined?(::ActiveRecord::Base)
+
+          Pgbus::BusRecord.connection_handler.clear_active_connections!
+        rescue StandardError => e
+          @logger.debug { "[Pgbus::Streamer::StreamEventDispatcher] AR connection release failed: #{e.class}: #{e.message}" }
+        end
+
         def record_stat(stream_name:, event_type:, started_at:, fanout: nil, ephemeral: false)
           return unless ephemeral || @config.streams_stats_enabled
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
 - Mikael Henriksson