diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
commit | ce8a0b90849ac5d1895e741c023432930f24d724 (patch) | |
tree | dbdc97de542cdbe18a2fc8b1a6b64ac0673ed3d3 /app/workers/concerns | |
parent | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (diff) | |
download | gitlab-ce-ce8a0b90849ac5d1895e741c023432930f24d724.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/concerns')
-rw-r--r-- | app/workers/concerns/worker_attributes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/concerns/worker_attributes.rb b/app/workers/concerns/worker_attributes.rb index 216f73b58e2..b60179531af 100644 --- a/app/workers/concerns/worker_attributes.rb +++ b/app/workers/concerns/worker_attributes.rb @@ -8,7 +8,7 @@ module WorkerAttributes VALID_RESOURCE_BOUNDARIES = [:memory, :cpu, :unknown].freeze # Urgencies that workers can declare through the `urgencies` attribute - VALID_URGENCIES = [:high, :default, :none].freeze + VALID_URGENCIES = [:high, :low, :throttled].freeze NAMESPACE_WEIGHTS = { auto_devops: 2, @@ -65,7 +65,7 @@ module WorkerAttributes end def get_urgency - worker_attributes[:urgency] || :default + worker_attributes[:urgency] || :low end # Set this attribute on a job when it will call to services outside of the |