ask-state-providers 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 269e8a62defb31a02eb53fe42e5e13fb375b1a2037d3feb1a88048481f670ff5
-  data.tar.gz: 86ca88be92adcd9ee95651904cf3fd72079a1adc899a1870c87065de1657d1e8
+  metadata.gz: cb68f83181b30aa39191b2d19252a62231921b17aae87e1f3673bc0bb97cfacb
+  data.tar.gz: 8ffdbac8c8577c8934482c8ed7b2b8e96563e9994ba48770ecbe7c51b0eaca46
 SHA512:
-  metadata.gz: 0f8cd296decf02725687d44a96d3991b074fe975425885bf49ca064f68472370ed17d4596a336c8abaf6f8ff20366d0d7ff571a26dd7f46df1a0017c1d5053ac
-  data.tar.gz: 7c7425f0732e1f92b66b9458274ded4009e42ef673ac354e266290055af0792a0451d27e2c1b6b1ff9329c26ed2e0400283471dd4890962a7b7b8c1dfae75cd1
+  metadata.gz: '0907e2cbe480f8760546a6f5790ea19ab8c81694db591a864ebc4de4f538d1f1baecac436b91257f544ed93e8b9de7ffeaa9d396c118b7a63a87750167a69e62'
+  data.tar.gz: 42984849cf013942caf8fbc27a859abc40e37720bf5c26a60e92c4e435f0df0cb133f1c591ef0e88284ac5b342e451c084c34fd0eb55391200d9161163de6ec3

data/lib/ask/state/providers/postgres.rb

@@ -60,6 +60,13 @@ module Ask
         # @param pool_size [Integer] connection pool size (default 5)
         def initialize(url: ENV.fetch("DATABASE_URL", "postgres://localhost:5432/ask_state"),
                        pool_size: 5)
+          # On macOS, libpq's default GSSAPI negotiation can segfault
+          # when a forked process (SolidQueue worker) opens a fresh
+          # connection — the same crash the sibling apps guard with
+          # `gssencmode: disable` in database.yml. The store connects
+          # directly (not through ActiveRecord), so the guard lives here.
+          url = self.class.darwin_safe_url(url) if RUBY_PLATFORM =~ /darwin/
+
           @pool = ConnectionPool.new(size: pool_size) do
             ::PG.connect(url)
           end
@@ -67,10 +74,18 @@ module Ask
           migrate
         end
 
+        # Append gssencmode=disable to a URL on macOS (idempotent).
+        def self.darwin_safe_url(url)
+          return url if url.include?("gssencmode")
+
+          separator = url.include?("?") ? "&" : "?"
+          "#{url}#{separator}gssencmode=disable"
+        end
+
         # -- key-value --
 
         def get(key)
-          @pool.with do |conn|
+          with_connection do |conn|
             row = conn.exec_params(<<~SQL, [key, Time.now.utc])
               SELECT value FROM state_store
               WHERE key = $1 AND (expires_at IS NULL OR expires_at > $2)
@@ -80,7 +95,7 @@ module Ask
         end
 
         def set(key, value, ttl: nil)
-          @pool.with do |conn|
+          with_connection do |conn|
             # Explicit casts: $3 is nil when no ttl, and PostgreSQL can't
             # infer a type for a bare NULL parameter.
             conn.exec_params(<<~SQL, [key, JSON.generate(value), ttl ? Time.now.utc + ttl : nil])
@@ -94,7 +109,7 @@ module Ask
         end
 
         def delete(key)
-          @pool.with do |conn|
+          with_connection do |conn|
             conn.exec_params("DELETE FROM state_store WHERE key = $1", [key])
             # delete removes everything under the key, including ordered
             # lists (consumers store event feeds as lists).
@@ -103,7 +118,7 @@ module Ask
         end
 
         def set_if_not_exists(key, value, ttl: nil)
-          @pool.with do |conn|
+          with_connection do |conn|
             now = Time.now.utc
             expires = ttl ? now + ttl : nil
 
@@ -128,7 +143,7 @@ module Ask
         end
 
         def clear
-          @pool.with do |conn|
+          with_connection do |conn|
             conn.exec("DELETE FROM state_store")
             conn.exec("DELETE FROM locks")
             conn.exec("DELETE FROM queues")
@@ -137,7 +152,7 @@ module Ask
         end
 
         def exists?(key)
-          @pool.with do |conn|
+          with_connection do |conn|
             result = conn.exec_params(<<~SQL, [key, Time.now.utc])
               SELECT 1 FROM state_store
               WHERE key = $1 AND (expires_at IS NULL OR expires_at > $2)
@@ -147,7 +162,7 @@ module Ask
         end
 
         def keys(pattern: nil)
-          @pool.with do |conn|
+          with_connection do |conn|
             sql, params = if pattern
               like = self.class.glob_to_like(pattern)
               [<<~SQL, [like, Time.now.utc]]
@@ -171,7 +186,7 @@ module Ask
           expires_at_time = now + ttl
           token = SecureRandom.hex(16)
 
-          acquired = @pool.with do |conn|
+          acquired = with_connection do |conn|
             # First clean up expired locks
             conn.exec_params("DELETE FROM locks WHERE key = $1 AND expires_at <= $2",
                            [key, now])
@@ -191,7 +206,7 @@ module Ask
         end
 
         def release_lock(key, lock)
-          @pool.with do |conn|
+          with_connection do |conn|
             result = conn.exec_params(
               "DELETE FROM locks WHERE key = $1 AND token = $2",
               [key, lock.token]
@@ -205,7 +220,7 @@ module Ask
         def enqueue(queue, value)
           id = SecureRandom.uuid
 
-          @pool.with do |conn|
+          with_connection do |conn|
             conn.exec_params(<<~SQL, [queue, JSON.generate(value), Time.now.utc])
               INSERT INTO queues (queue_name, value, enqueued_at)
               VALUES ($1, $2, $3)
@@ -216,7 +231,7 @@ module Ask
         end
 
         def dequeue(queue)
-          @pool.with do |conn|
+          with_connection do |conn|
             result = conn.exec_params(<<~SQL, [queue])
               DELETE FROM queues
               WHERE id = (
@@ -238,7 +253,7 @@ module Ask
         end
 
         def queue_depth(queue)
-          @pool.with do |conn|
+          with_connection do |conn|
             result = conn.exec_params(
               "SELECT COUNT(*) AS cnt FROM queues WHERE queue_name = $1", [queue]
             )
@@ -249,7 +264,7 @@ module Ask
         # -- ordered lists --
 
         def list_append(key, value, max_length: nil)
-          @pool.with do |conn|
+          with_connection do |conn|
             conn.exec_params(<<~SQL, [key, JSON.generate(value)])
               INSERT INTO lists (list_key, value)
               VALUES ($1, $2)
@@ -274,7 +289,7 @@ module Ask
         end
 
         def list_range(key, start = 0, stop = -1)
-          @pool.with do |conn|
+          with_connection do |conn|
             rows = if stop == -1
               conn.exec_params(<<~SQL, [key, start])
                 SELECT value FROM lists
@@ -297,7 +312,7 @@ module Ask
 
         def list_remove(key, value)
           serialized = JSON.generate(value)
-          @pool.with do |conn|
+          with_connection do |conn|
             result = conn.exec_params(
               "DELETE FROM lists WHERE list_key = $1 AND value = $2",
               [key, serialized]
@@ -311,17 +326,29 @@ module Ask
         # Idempotent setup — creates tables if they don't exist.
         # Called automatically on initialize. Safe to call multiple times.
         def setup!
-          @pool.with { |conn| conn.exec(MIGRATIONS) }
+          with_connection { |conn| conn.exec(MIGRATIONS) }
         end
 
         def close
-          @pool&.shutdown { |c| c.close }
+          @pool&.shutdown { |c| c.close unless c.finished? }
         end
 
         private
 
+        # Check out a connection, running the block with it. A dead
+        # pooled connection (the server closed it — a fork inherited it,
+        # an idle timeout, a server restart) raises PG::ConnectionBad;
+        # reload the pool and retry once so a stale checkout never
+        # surfaces to callers.
+        def with_connection(&block)
+          @pool.with(&block)
+        rescue PG::ConnectionBad
+          @pool.reload { |conn| conn.close unless conn.finished? }
+          @pool.with(&block)
+        end
+
         def migrate
-          @pool.with { |conn| conn.exec(MIGRATIONS) }
+          with_connection { |conn| conn.exec(MIGRATIONS) }
         end
       end
     end

data/lib/ask/state/providers/version.rb

@@ -3,7 +3,7 @@
 module Ask
   module State
     module Providers
-      VERSION = "0.4.4"
+      VERSION = "0.4.6"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-state-providers
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Kaka Ruto