From 88f1b3b195409d534f86c2b609767528ad6fbc5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <loic@discourse.org>
Date: Thu, 28 Nov 2024 15:13:19 +0100
Subject: [PATCH] DEV: Try fixing flaky spec related to Scheduler::Defer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Checking if a connection is available is probably not enough, when the
connection is available, we should still verify it’s not stale.
---
 lib/scheduler/defer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/scheduler/defer.rb b/lib/scheduler/defer.rb
index fdf76c5c2cf..755bdaedc68 100644
--- a/lib/scheduler/defer.rb
+++ b/lib/scheduler/defer.rb
@@ -136,7 +136,7 @@ module Scheduler
     rescue => ex
       Discourse.handle_job_exception(ex, message: "Processing deferred code queue")
     ensure
-      if ActiveRecord::Base.connection
+      if ActiveRecord::Base.connection&.verify!
         ActiveRecord::Base.connection_handler.clear_active_connections!
       end
       if start