From ad900ef9ddc3806d18488adb24c7a6200724b834 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Fri, 16 Feb 2024 10:11:46 +0800 Subject: [PATCH] Revert "DEV: Debug AR connection pool queue on CI (#25687)" (#25714) This reverts commit 796af077c5bfe31999203e78782d27dfafafb1c2. We have not seen checkout timeout errors since c30aeafd9db40bfbd848430359285547a1b1f605 --- .github/workflows/tests.yml | 2 - lib/freedom_patches/debug_connection_queue.rb | 40 ------------------- 2 files changed, 42 deletions(-) delete mode 100644 lib/freedom_patches/debug_connection_queue.rb diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bca8ca195af..22c4ed07369 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -244,7 +244,6 @@ jobs: if: matrix.build_type == 'system' && matrix.target == 'plugins' env: CHECKOUT_TIMEOUT: 10 - DEBUG_AR_CONNECTION_QUEUE: 1 run: | GLOBIGNORE="plugins/chat/*"; LOAD_PLUGINS=1 RAILS_ENABLE_TEST_LOG=1 RAILS_TEST_LOG_LEVEL=error PARALLEL_TEST_PROCESSORS=4 bin/turbo_rspec --use-runtime-info --profile=50 --verbose --format documentation plugins/*/spec/system @@ -255,7 +254,6 @@ jobs: if: matrix.build_type == 'system' && matrix.target == 'chat' env: CHECKOUT_TIMEOUT: 10 - DEBUG_AR_CONNECTION_QUEUE: 1 run: LOAD_PLUGINS=1 RAILS_ENABLE_TEST_LOG=1 RAILS_TEST_LOG_LEVEL=error PARALLEL_TEST_PROCESSORS=4 bin/turbo_rspec --use-runtime-info --profile=50 --verbose --format documentation plugins/chat/spec/system timeout-minutes: 30 diff --git a/lib/freedom_patches/debug_connection_queue.rb b/lib/freedom_patches/debug_connection_queue.rb deleted file mode 100644 index fd70e6bcd83..00000000000 --- a/lib/freedom_patches/debug_connection_queue.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: true - -if ENV["DEBUG_AR_CONNECTION_QUEUE"] == "1" - module QueuePatch - # Add +element+ to the queue. Never blocks. - def add(element) - puts "::group::##{Process.pid} Adding element to the queue" - puts Thread.current.backtrace.first(30).join("\n") - puts "::endgroup::" - super - end - - # If +element+ is in the queue, remove and return it, or +nil+. - def delete(element) - puts "::group::##{Process.pid} Delete element from the queue" - puts Thread.current.backtrace.first(30).join("\n") - puts "::endgroup::" - super - end - - # Remove all elements from the queue. - def clear - puts "::group::##{Process.pid} Clear all elements from the queue" - puts Thread.current.backtrace.first(30).join("\n") - puts "::endgroup::" - super - end - - private - - def remove - puts "::group::##{Process.pid} Removing element from the queue" - puts Thread.current.backtrace.first(30).join("\n") - puts "::endgroup::" - super - end - end - - ActiveRecord::ConnectionAdapters::ConnectionPool::Queue.prepend(QueuePatch) -end