Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

2 files changed, 7 insertions, 4 deletions

diff --git a/lib/backup/database.rb b/lib/backup/database.rb
index 28bc78a3932..12656cb3702 100644
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -63,7 +63,7 @@ module Backup
         progress.flush
       end
     ensure
-      ::Gitlab::Database::EachDatabase.each_database_connection(
+      ::Gitlab::Database::EachDatabase.each_connection(
         only: base_models_for_backup.keys, include_shared: false
       ) do |connection, _|
         Gitlab::Database::TransactionTimeoutSettings.new(connection).restore_timeouts
@@ -259,7 +259,7 @@ module Backup
       @database_to_snapshot_id = {}
 
       if @database_to_snapshot_id.empty?
-        ::Gitlab::Database::EachDatabase.each_database_connection(
+        ::Gitlab::Database::EachDatabase.each_connection(
           only: base_models_for_backup.keys, include_shared: false
         ) do |connection, database_name|
           @database_to_snapshot_id[database_name] = nil
diff --git a/lib/backup/repositories.rb b/lib/backup/repositories.rb
index 56726665d14..199da8821d9 100644
--- a/lib/backup/repositories.rb
+++ b/lib/backup/repositories.rb
@@ -58,8 +58,11 @@ module Backup
     end
 
     def enqueue_consecutive_projects
-      project_relation.find_each(batch_size: 1000) do |project|
-        enqueue_project(project)
+      cross_join_issue = "https://gitlab.com/gitlab-org/gitlab/-/issues/417467"
+      ::Gitlab::Database.allow_cross_joins_across_databases(url: cross_join_issue) do
+        project_relation.find_each(batch_size: 1000) do |project|
+          enqueue_project(project)
+        end
       end
     end