diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-20 15:35:57 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-03-27 16:51:33 +0000 |
| commit | 0e831b0b692f2988d3c84fc01a463b08afec05ad (patch) | |
| tree | 3fdcb423db62141b2db2d2cc3f39986fb929c8af /app/workers | |
| parent | 98824f3e97e24a5d6cb0688167bc8411a74739fc (diff) | |
| download | gitlab-ce-0e831b0b692f2988d3c84fc01a463b08afec05ad.tar.gz | |
Allow external diffs to be used conditionally
Since external diffs are likely to be a bit slower than in-database
ones, add a mode that makes diffs external after they've been obsoleted
by events. This should strike a balance between performance and disk
space.
A background cron drives the majority of migrations, since diffs become
outdated through user actions.
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/all_queues.yml | 2 | ||||
| -rw-r--r-- | app/workers/migrate_external_diffs_worker.rb | 12 | ||||
| -rw-r--r-- | app/workers/schedule_migrate_external_diffs_worker.rb | 14 |
3 files changed, 28 insertions, 0 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 6ebd756d3da..3e8c2a1209a 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -21,6 +21,7 @@ - cronjob:trending_projects - cronjob:issue_due_scheduler - cronjob:prune_web_hook_logs +- cronjob:schedule_migrate_external_diffs - gcp_cluster:cluster_install_app - gcp_cluster:cluster_patch_app @@ -119,6 +120,7 @@ - invalid_gpg_signature_update - irker - merge +- migrate_external_diffs - namespaceless_project_destroy - new_issue - new_merge_request diff --git a/app/workers/migrate_external_diffs_worker.rb b/app/workers/migrate_external_diffs_worker.rb new file mode 100644 index 00000000000..debac97af2c --- /dev/null +++ b/app/workers/migrate_external_diffs_worker.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: false + +class MigrateExternalDiffsWorker + include ApplicationWorker + + def perform(merge_request_diff_id) + diff = MergeRequestDiff.find_by_id(merge_request_diff_id) + return unless diff + + MergeRequests::MigrateExternalDiffsService.new(diff).execute + end +end diff --git a/app/workers/schedule_migrate_external_diffs_worker.rb b/app/workers/schedule_migrate_external_diffs_worker.rb new file mode 100644 index 00000000000..70910f7ca04 --- /dev/null +++ b/app/workers/schedule_migrate_external_diffs_worker.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: false + +class ScheduleMigrateExternalDiffsWorker + include ApplicationWorker + include CronjobQueue + include Gitlab::ExclusiveLeaseHelpers + + def perform + in_lock(self.class.name.underscore, ttl: 2.hours, retries: 0) do + MergeRequests::MigrateExternalDiffsService.enqueue! + end + rescue Gitlab::ExclusiveLeaseHelpers::FailedToObtainLockError + end +end |