Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 55 insertions, 0 deletions

diff --git a/db/post_migrate/20200511162057_add_missing_instance_to_servicess.rb b/db/post_migrate/20200511162057_add_missing_instance_to_servicess.rb
new file mode 100644
index 00000000000..efaef085e8c
--- /dev/null
+++ b/db/post_migrate/20200511162057_add_missing_instance_to_servicess.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class AddMissingInstanceToServicess < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  # This is a corrective migration to keep the instance column.
+  # Upgrade from 12.7 to 12.9 removes the instance column as it was first added
+  # in the normal migration and then removed in the post migration.
+  #
+  # 12.8 removed the instance column in a post deployment migration https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24885
+  # 12.9 added the instance column in a normal migration https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25714
+  #
+  # rubocop:disable Migration/AddColumnWithDefault
+  # rubocop:disable Migration/UpdateLargeTable
+  def up
+    unless column_exists?(:services, :instance)
+      add_column_with_default(:services, :instance, :boolean, default: false)
+    end
+  end
+  # rubocop:enable Migration/AddColumnWithDefault
+  # rubocop:enable Migration/UpdateLargeTable
+
+  def down
+    # Does not apply
+  end
+end
diff --git a/db/post_migrate/20200511162115_add_missing_index_to_service_unique_instance_per_type.rb b/db/post_migrate/20200511162115_add_missing_index_to_service_unique_instance_per_type.rb
new file mode 100644
index 00000000000..c9e0193f5d2
--- /dev/null
+++ b/db/post_migrate/20200511162115_add_missing_index_to_service_unique_instance_per_type.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddMissingIndexToServiceUniqueInstancePerType < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  # This is a corrective migration to keep the index on instance column.
+  # Upgrade from 12.7 to 12.9 removes the instance column as it was first added
+  # in the normal migration and then removed in the post migration.
+  #
+  # 12.8 removed the instance column in a post deployment migration https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24885
+  # 12.9 added the instance column in a normal migration https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25714
+  def up
+    unless index_exists_by_name?(:services, 'index_services_on_type_and_instance')
+      add_concurrent_index(:services, [:type, :instance], unique: true, where: 'instance IS TRUE')
+    end
+  end
+
+  def down
+    # Does not apply
+  end
+end