Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

3 files changed, 52 insertions, 8 deletions

diff --git a/lib/gitlab/patch/database_config.rb b/lib/gitlab/patch/database_config.rb
index 20d8f7be8fd..8a7566f6e0e 100644
--- a/lib/gitlab/patch/database_config.rb
+++ b/lib/gitlab/patch/database_config.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # The purpose of this code is to set the migrations path
-# for the Geo tracking database.
+# for the Geo tracking database and the embedding database.
 module Gitlab
   module Patch
     module DatabaseConfig
@@ -10,13 +10,17 @@ module Gitlab
       def database_configuration
         super.to_h do |env, configs|
           if Gitlab.ee?
-            if configs.key?("geo")
-              migrations_paths = Array(configs["geo"]["migrations_paths"])
-              migrations_paths << "ee/db/geo/migrate" if migrations_paths.empty?
-              migrations_paths << "ee/db/geo/post_migrate" unless ENV['SKIP_POST_DEPLOYMENT_MIGRATIONS']
+            ee_databases = %w[embedding geo]
 
-              configs["geo"]["migrations_paths"] = migrations_paths.uniq
-              configs["geo"]["schema_migrations_path"] = "ee/db/geo/schema_migrations" if configs["geo"]["schema_migrations_path"].blank?
+            ee_databases.each do |ee_db_name|
+              next unless configs.key?(ee_db_name)
+
+              migrations_paths = Array(configs[ee_db_name]['migrations_paths'])
+              migrations_paths << File.join('ee', 'db', ee_db_name, 'migrate') if migrations_paths.empty?
+              migrations_paths << File.join('ee', 'db', ee_db_name, 'post_migrate') unless ENV['SKIP_POST_DEPLOYMENT_MIGRATIONS']
+
+              configs[ee_db_name]['migrations_paths'] = migrations_paths.uniq
+              configs[ee_db_name]['schema_migrations_path'] = File.join('ee', 'db', ee_db_name, 'schema_migrations') if configs[ee_db_name]['schema_migrations_path'].blank?
             end
           end
 
diff --git a/lib/gitlab/patch/draw_route.rb b/lib/gitlab/patch/draw_route.rb
index 61b25065e8f..67da6c9c943 100644
--- a/lib/gitlab/patch/draw_route.rb
+++ b/lib/gitlab/patch/draw_route.rb
@@ -27,7 +27,7 @@ module Gitlab
 
       def draw_route(path)
         if File.exist?(path)
-          instance_eval(File.read(path))
+          instance_eval(File.read(path), path.to_s)
           true
         else
           false
diff --git a/lib/gitlab/patch/node_loader.rb b/lib/gitlab/patch/node_loader.rb
new file mode 100644
index 00000000000..79f4b17dd93
--- /dev/null
+++ b/lib/gitlab/patch/node_loader.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Patch to address https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/2212#note_1287996694
+# It uses hostname instead of IP address if the former is present in `CLUSTER NODES` output.
+if Gem::Version.new(Redis::VERSION) > Gem::Version.new('4.8.1')
+  raise 'New version of redis detected, please remove or update this patch'
+end
+
+module Gitlab
+  module Patch
+    module NodeLoader
+      def self.prepended(base)
+        base.class_eval do
+          # monkey-patches https://github.com/redis/redis-rb/blob/v4.8.0/lib/redis/cluster/node_loader.rb#L23
+          def self.fetch_node_info(node)
+            node.call(%i[cluster nodes]).split("\n").map(&:split).to_h do |arr|
+              [
+                extract_host_identifier(arr[1]),
+                (arr[2].split(',') & %w[master slave]).first # rubocop:disable Naming/InclusiveLanguage
+              ]
+            end
+          end
+
+          # Since `CLUSTER SLOT` uses the preferred endpoint determined by
+          # the `cluster-preferred-endpoint-type` config value, we will prefer hostname over IP address.
+          # See https://redis.io/commands/cluster-nodes/ for details on the output format.
+          #
+          # @param [String] Address info matching fhe format: <ip:port@cport[,hostname[,auxiliary_field=value]*]>
+          def self.extract_host_identifier(node_address)
+            ip_chunk, hostname, _auxiliaries = node_address.split(',')
+            return ip_chunk.split('@').first if hostname.blank?
+
+            port = ip_chunk.split('@').first.split(':')[1]
+            "#{hostname}:#{port}"
+          end
+        end
+      end
+    end
+  end
+end