Merge branch...

Merge branch '324160-geo-zero-downtime-upgrades-step-gitlab-rake-db-migrate-fails-in-13-9-3' into 'master'

Fix zero-downtime upgrade from 13.8.x to 13.9.3

See merge request gitlab-org/gitlab!56352

db/migrate/20210301200601_rename_asset_proxy_allowlist_on_application_settings.rb

@@ -8,6 +8,10 @@ class RenameAssetProxyAllowlistOnApplicationSettings < ActiveRecord::Migration[6
   disable_ddl_transaction!
 
   def up
+    cleanup_concurrent_column_rename :application_settings,
+      :asset_proxy_whitelist,
+      :asset_proxy_allowlist
+
     rename_column_concurrently :application_settings,
       :asset_proxy_allowlist,
       :asset_proxy_whitelist
@@ -17,5 +21,9 @@ class RenameAssetProxyAllowlistOnApplicationSettings < ActiveRecord::Migration[6
     undo_rename_column_concurrently :application_settings,
       :asset_proxy_allowlist,
       :asset_proxy_whitelist
+
+    undo_cleanup_concurrent_column_rename :application_settings,
+      :asset_proxy_whitelist,
+      :asset_proxy_allowlist
   end
 end

db/post_migrate/20210105052229_clean_up_asset_proxy_whitelist_rename_on_application_settings.rb

@@ -8,14 +8,12 @@ class CleanUpAssetProxyWhitelistRenameOnApplicationSettings < ActiveRecord::Migr
   disable_ddl_transaction!
 
   def up
-    cleanup_concurrent_column_rename :application_settings,
-      :asset_proxy_whitelist,
-      :asset_proxy_allowlist
+    # This migration has been made a no-op in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56352
+    # because to revert the rename in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55419 we need
+    # to cleanup the triggers on the `asset_proxy_allowlist` column. As such, this migration would do nothing.
   end
 
   def down
-    undo_cleanup_concurrent_column_rename :application_settings,
-      :asset_proxy_whitelist,
-      :asset_proxy_allowlist
+    # no-op
   end
 end

ee/changelogs/unreleased/324160-geo-zero-downtime-upgrades-step-gitlab-rake-db-migrate-fails-in.yml

+---
+title: Fix zero-downtime upgrade from 13.8.x to 13.9.3
+merge_request: 56352
+author:
+type: fixed