Use with_lock_retries for migration

db/migrate/20210819162047_add_columns_to_namespace_settings.rb

 # frozen_string_literal: true
 
 class AddColumnsToNamespaceSettings < ActiveRecord::Migration[6.1]
-  def change
-    add_column :namespace_settings, :setup_for_company, :boolean
-    add_column :namespace_settings, :jobs_to_be_done, :smallint
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      add_column :namespace_settings, :setup_for_company, :boolean
+      add_column :namespace_settings, :jobs_to_be_done, :smallint
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :namespace_settings, :setup_for_company
+      remove_column :namespace_settings, :jobs_to_be_done
+    end
   end
 end