Merge branch 'app-logger-13' into 'master'

Use applogger in lib/gitlab/database/

See merge request gitlab-org/gitlab!41068

changelogs/unreleased/app-logger-13.yml

+---
+title: Use applogger in lib/gitlab/database
+merge_request: 41068
+author: Rajendra Kadam
+type: other

lib/gitlab/database/migration_helpers.rb

@@ -87,7 +87,7 @@ module Gitlab
         options = options.merge({ algorithm: :concurrently })
 
         if index_exists?(table_name, column_name, options)
-          Rails.logger.warn "Index not created because it already exists (this may be due to an aborted migration or similar): table_name: #{table_name}, column_name: #{column_name}" # rubocop:disable Gitlab/RailsLogger
+          Gitlab::AppLogger.warn "Index not created because it already exists (this may be due to an aborted migration or similar): table_name: #{table_name}, column_name: #{column_name}"
           return
         end
 
@@ -113,7 +113,7 @@ module Gitlab
         options = options.merge({ algorithm: :concurrently })
 
         unless index_exists?(table_name, column_name, options)
-          Rails.logger.warn "Index not removed because it does not exist (this may be due to an aborted migration or similar): table_name: #{table_name}, column_name: #{column_name}" # rubocop:disable Gitlab/RailsLogger
+          Gitlab::AppLogger.warn "Index not removed because it does not exist (this may be due to an aborted migration or similar): table_name: #{table_name}, column_name: #{column_name}"
           return
         end
 
@@ -143,7 +143,7 @@ module Gitlab
         options = options.merge({ algorithm: :concurrently })
 
         unless index_exists_by_name?(table_name, index_name)
-          Rails.logger.warn "Index not removed because it does not exist (this may be due to an aborted migration or similar): table_name: #{table_name}, index_name: #{index_name}" # rubocop:disable Gitlab/RailsLogger
+          Gitlab::AppLogger.warn "Index not removed because it does not exist (this may be due to an aborted migration or similar): table_name: #{table_name}, index_name: #{index_name}"
           return
         end
 
@@ -163,7 +163,6 @@ module Gitlab
       #             defaults to "CASCADE".
       # name - The name of the foreign key.
       #
-      # rubocop:disable Gitlab/RailsLogger
       def add_concurrent_foreign_key(source, target, column:, on_delete: :cascade, name: nil, validate: true)
         # Transactions would result in ALTER TABLE locks being held for the
         # duration of the transaction, defeating the purpose of this method.
@@ -183,7 +182,7 @@ module Gitlab
             "source: #{source}, target: #{target}, column: #{options[:column]}, "\
             "name: #{options[:name]}, on_delete: #{options[:on_delete]}"
 
-          Rails.logger.warn warning_message
+          Gitlab::AppLogger.warn warning_message
         else
           # Using NOT VALID allows us to create a key without immediately
           # validating it. This means we keep the ALTER TABLE lock only for a
@@ -217,7 +216,6 @@ module Gitlab
           end
         end
       end
-      # rubocop:enable Gitlab/RailsLogger
 
       def validate_foreign_key(source, column, name: nil)
         fk_name = name || concurrent_foreign_key_name(source, column)
@@ -1085,7 +1083,6 @@ into similar problems in the future (e.g. when new tables are created).
       #                   Should be unique per table (not per column)
       # validate - Whether to validate the constraint in this call
       #
-      # rubocop:disable Gitlab/RailsLogger
       def add_check_constraint(table, check, constraint_name, validate: true)
         validate_check_constraint_name!(constraint_name)
 
@@ -1102,7 +1099,7 @@ into similar problems in the future (e.g. when new tables are created).
             table: #{table}, check: #{check}, constraint name: #{constraint_name}
           MESSAGE
 
-          Rails.logger.warn warning_message
+          Gitlab::AppLogger.warn warning_message
         else
           # Only add the constraint without validating it
           # Even though it is fast, ADD CONSTRAINT requires an EXCLUSIVE lock
@@ -1187,7 +1184,7 @@ into similar problems in the future (e.g. when new tables are created).
             column #{table}.#{column} is already defined as `NOT NULL`
           MESSAGE
 
-          Rails.logger.warn warning_message
+          Gitlab::AppLogger.warn warning_message
         end
       end
 

lib/gitlab/database/partitioning_migration_helpers/foreign_key_helpers.rb

@@ -31,7 +31,7 @@ module Gitlab
 
               current_keys << specified_key
             else
-              Rails.logger.warn "foreign key not added because it already exists: #{specified_key}" # rubocop:disable Gitlab/RailsLogger
+              Gitlab::AppLogger.warn "foreign key not added because it already exists: #{specified_key}"
               current_keys
             end
           end
@@ -56,7 +56,7 @@ module Gitlab
               existing_key.delete
               current_keys.delete(existing_key)
             else
-              Rails.logger.warn "foreign key not removed because it doesn't exist: #{specified_key}" # rubocop:disable Gitlab/RailsLogger
+              Gitlab::AppLogger.warn "foreign key not removed because it doesn't exist: #{specified_key}"
             end
 
             current_keys

lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb

@@ -202,10 +202,8 @@ module Gitlab
 
         def create_range_partitioned_copy(source_table_name, partitioned_table_name, partition_column, primary_key)
           if table_exists?(partitioned_table_name)
-            # rubocop:disable Gitlab/RailsLogger
-            Rails.logger.warn "Partitioned table not created because it already exists" \
+            Gitlab::AppLogger.warn "Partitioned table not created because it already exists" \
               " (this may be due to an aborted migration or similar): table_name: #{partitioned_table_name} "
-            # rubocop:enable Gitlab/RailsLogger
             return
           end
 
@@ -258,10 +256,8 @@ module Gitlab
 
         def create_range_partition_safely(partition_name, table_name, lower_bound, upper_bound)
           if table_exists?(table_for_range_partition(partition_name))
-            # rubocop:disable Gitlab/RailsLogger
-            Rails.logger.warn "Partition not created because it already exists" \
+            Gitlab::AppLogger.warn "Partition not created because it already exists" \
               " (this may be due to an aborted migration or similar): partition_name: #{partition_name}"
-            # rubocop:enable Gitlab/RailsLogger
             return
           end
 
@@ -282,10 +278,8 @@ module Gitlab
 
         def create_sync_function(name, partitioned_table_name, unique_key)
           if function_exists?(name)
-            # rubocop:disable Gitlab/RailsLogger
-            Rails.logger.warn "Partitioning sync function not created because it already exists" \
+            Gitlab::AppLogger.warn "Partitioning sync function not created because it already exists" \
               " (this may be due to an aborted migration or similar): function name: #{name}"
-            # rubocop:enable Gitlab/RailsLogger
             return
           end
 
@@ -317,10 +311,8 @@ module Gitlab
 
         def create_sync_trigger(table_name, trigger_name, function_name)
           if trigger_exists?(table_name, trigger_name)
-            # rubocop:disable Gitlab/RailsLogger
-            Rails.logger.warn "Partitioning sync trigger not created because it already exists" \
+            Gitlab::AppLogger.warn "Partitioning sync trigger not created because it already exists" \
               " (this may be due to an aborted migration or similar): trigger name: #{trigger_name}"
-            # rubocop:enable Gitlab/RailsLogger
             return
           end
 

lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb

@@ -71,7 +71,7 @@ module Gitlab
 
                 unless gitlab_shell.mv_namespace(repository_storage, old_full_path, new_full_path)
                   message = "Exception moving on shard #{repository_storage} from #{old_full_path} to #{new_full_path}"
-                  Rails.logger.error message # rubocop:disable Gitlab/RailsLogger
+                  Gitlab::AppLogger.error message
                 end
               end
             end

lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb

@@ -56,7 +56,7 @@ module Gitlab
             unless gitlab_shell.mv_repository(project.repository_storage,
                                               old_path,
                                               new_path)
-              Rails.logger.error "Error moving #{old_path} to #{new_path}" # rubocop:disable Gitlab/RailsLogger
+              Gitlab::AppLogger.error "Error moving #{old_path} to #{new_path}"
             end
           end