diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-09-13 23:08:51 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-09-21 12:05:40 -0300 |
| commit | 16c02ccf010bd0123aaa3e5dade6309c3b22b9c8 (patch) | |
| tree | fe9967171dbcc347072e777d680b7be9e08e2578 | |
| parent | ec33016bcd07f3806f071d574299079b67cb0a93 (diff) | |
| download | gitlab-ce-osw-clean-up-phase-for-diff-files-removal.tar.gz | |
Add clean-up phase for ScheduleDiffFilesDeletionosw-clean-up-phase-for-diff-files-removal
Process any remaining ScheduleDiffFilesDeletion workers and remove
temporary added index.
| -rw-r--r-- | changelogs/unreleased/osw-clean-up-phase-for-diff-files-removal.yml | 5 | ||||
| -rw-r--r-- | db/post_migrate/20180913051323_consume_remaining_diff_files_deletion_jobs.rb | 23 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/changelogs/unreleased/osw-clean-up-phase-for-diff-files-removal.yml b/changelogs/unreleased/osw-clean-up-phase-for-diff-files-removal.yml new file mode 100644 index 00000000000..03189d934a7 --- /dev/null +++ b/changelogs/unreleased/osw-clean-up-phase-for-diff-files-removal.yml @@ -0,0 +1,5 @@ +--- +title: Add clean-up phase for ScheduleDiffFilesDeletion migration +merge_request: 21734 +author: +type: other diff --git a/db/post_migrate/20180913051323_consume_remaining_diff_files_deletion_jobs.rb b/db/post_migrate/20180913051323_consume_remaining_diff_files_deletion_jobs.rb new file mode 100644 index 00000000000..ed9422a3894 --- /dev/null +++ b/db/post_migrate/20180913051323_consume_remaining_diff_files_deletion_jobs.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class ConsumeRemainingDiffFilesDeletionJobs < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + MIGRATION = 'ScheduleDiffFilesDeletion'.freeze + TMP_INDEX = 'tmp_partial_diff_id_with_files_index'.freeze + + def up + # Perform any ongoing background migration that might still be scheduled. + Gitlab::BackgroundMigration.steal(MIGRATION) + + remove_concurrent_index_by_name(:merge_request_diffs, TMP_INDEX) + end + + def down + add_concurrent_index(:merge_request_diffs, :id, where: "(state NOT IN ('without_files', 'empty'))", name: TMP_INDEX) + end +end diff --git a/db/schema.rb b/db/schema.rb index b299cde4898..f54962d20b4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180907015926) do +ActiveRecord::Schema.define(version: 20180913051323) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |