Tweaked some timeouts

devdicated · Jan 13, 2024 · 38e243d · 38e243d
1 parent c20e4ae
commit 38e243d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/lib/exekutor/internal/listener.rb b/lib/exekutor/internal/listener.rb
@@ -24,7 +24,7 @@ class Listener
       # @param pool [ThreadPoolExecutor] the thread pool to use
       # @param wait_timeout [Integer] the time to listen for notifications
       # @param set_db_connection_name [Boolean] whether to set the application name on the DB connection
-      def initialize(worker_id:, provider:, pool:, queues: nil, min_priority: nil, max_priority: nil, wait_timeout: 60,
+      def initialize(worker_id:, provider:, pool:, queues: nil, min_priority: nil, max_priority: nil, wait_timeout: 100,
                      set_db_connection_name: false)
         super()
         @config = {
@@ -159,11 +159,13 @@ def wait_for_jobs(connection)
       # @yieldparam connection [PG::Connection] the DB connection
       def with_pg_connection # :nodoc:
         ar_conn = Exekutor::Job.connection_pool.checkout.tap do |conn|
+          DatabaseConnection.ensure_active! conn
           # Action Cable is taking ownership over this database connection, and
           # will perform the necessary cleanup tasks
-          ActiveRecord::Base.connection_pool.remove(conn)
+          Exekutor::Job.connection_pool.remove conn
         end
-        DatabaseConnection.ensure_active! ar_conn
+        # Make sure the connection pool does not hold a reference to this thread
+        Exekutor::Job.connection_handler.clear_active_connections!
         pg_conn = ar_conn.raw_connection
 
         verify!(pg_conn)
@@ -172,7 +174,7 @@ def with_pg_connection # :nodoc:
         end
         yield pg_conn
       ensure
-        ar_conn.disconnect!
+        ar_conn&.disconnect!
       end
 
       # Verifies the connection
@@ -201,7 +203,7 @@ def self.parse(payload)
                        raise Error, "Invalid notification payload: #{payload}"
                      end
           if (missing_keys = JOB_INFO_KEYS.select { |n| job_info[n].blank? }).present?
-            raise Error, "[Listener] Notification payload is missing #{missing_keys.join(", ")}"
+            raise Error, "Notification payload is missing #{missing_keys.join(", ")}"
           end
 
           job_info

diff --git a/lib/exekutor/internal/provider.rb b/lib/exekutor/internal/provider.rb
@@ -18,7 +18,7 @@ class Provider
       UNKNOWN = Object.new.freeze
       private_constant :UNKNOWN
 
-      MAX_WAIT_TIMEOUT = 300
+      MAX_WAIT_TIMEOUT = 100
       private_constant :MAX_WAIT_TIMEOUT
 
       # Creates a new provider

diff --git a/test/internal/listener_test.rb b/test/internal/listener_test.rb
@@ -75,7 +75,7 @@ def test_corrupt_payload
   def test_incomplete_payload
     wait_until { listener.send(:listening?) }
 
-    listener.send(:logger).expects(:error).with(regexp_matches(/^\[Listener\] Notification payload is missing t$/))
+    listener.send(:logger).expects(:error).with(regexp_matches(/Notification payload is missing t$/))
 
     Exekutor::Job.connection.exec_query(
       %(NOTIFY "#{listener.class::JOB_ENQUEUED_CHANNEL}", 'id:test-id;q:test-queue;p:123')

diff --git a/test/internal/provider_test.rb b/test/internal/provider_test.rb
@@ -240,7 +240,7 @@ def test_wait_timeout_without_poll
     provider.stubs(:polling_enabled?).returns(false)
     provider.stubs(:next_job_scheduled_at).returns(nil)
 
-    assert_equal 300, provider.send(:wait_timeout)
+    assert_equal 100, provider.send(:wait_timeout)
   end
 
   def test_wait_timeout_with_immediate_job