diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:07:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:07:47 +0300 |
| commit | 6f2065c468b05658125b746169c56764a8ccddb1 (patch) | |
| tree | 544a488ae2e65e2fcfe4acce4e56623b85bbce5e /app/workers | |
| parent | e6baeabaa9651d90b03bb64ffce75a2c3cb89aab (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/all_queues.yml | 2 | ||||
| -rw-r--r-- | app/workers/project_export_worker.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index c101759ff9b..72a5a2b653e 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -1224,7 +1224,7 @@ - :name: project_export :feature_category: :importers :has_external_dependencies: - :urgency: :low + :urgency: :throttled :resource_boundary: :memory :weight: 1 :idempotent: diff --git a/app/workers/project_export_worker.rb b/app/workers/project_export_worker.rb index aaaf70f09b5..a287c511a65 100644 --- a/app/workers/project_export_worker.rb +++ b/app/workers/project_export_worker.rb @@ -7,6 +7,7 @@ class ProjectExportWorker # rubocop:disable Scalability/IdempotentWorker feature_category :importers worker_resource_boundary :memory + urgency :throttled def perform(current_user_id, project_id, after_export_strategy = {}, params = {}) current_user = User.find(current_user_id) |