Commit 9df3001b authored by Sean McGivern's avatar Sean McGivern

Merge branch 'bbodenmiller-master-patch-62927' into 'master'

Improve details on queue_selector rename

See merge request gitlab-org/gitlab!50473
parents 32c03a1d 6a2c3747
...@@ -50,7 +50,7 @@ these steps to move the logs to a new location without losing any data. ...@@ -50,7 +50,7 @@ these steps to move the logs to a new location without losing any data.
Jobs in progress are not affected, based on how [data flow](#data-flow) works. Jobs in progress are not affected, based on how [data flow](#data-flow) works.
```ruby ```ruby
sidekiq['experimental_queue_selector'] = true sidekiq['queue_selector'] = true
sidekiq['queue_groups'] = [ sidekiq['queue_groups'] = [
"feature_category!=continuous_integration" "feature_category!=continuous_integration"
] ]
......
...@@ -114,7 +114,7 @@ you list: ...@@ -114,7 +114,7 @@ you list:
> - [Introduced](https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/45) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.8. > - [Introduced](https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/45) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.8.
> - [Sidekiq cluster including queue selector moved](https://gitlab.com/groups/gitlab-com/gl-infra/-/epics/181) to GitLab [Core](https://about.gitlab.com/pricing/#self-managed) in GitLab 12.10. > - [Sidekiq cluster including queue selector moved](https://gitlab.com/groups/gitlab-com/gl-infra/-/epics/181) to GitLab [Core](https://about.gitlab.com/pricing/#self-managed) in GitLab 12.10.
> - [Marked as supported](https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/147) in GitLab [Core](https://about.gitlab.com/pricing/#self-managed) in GitLab 13.6. Renamed from `experimental_queue_selector` to `queue_selector`. > - [Renamed from `experimental_queue_selector` to `queue_selector`](https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/147) in GitLab 13.6.
In addition to selecting queues by name, as above, the `queue_selector` In addition to selecting queues by name, as above, the `queue_selector`
option allows queue groups to be selected in a more general way using option allows queue groups to be selected in a more general way using
......
...@@ -501,7 +501,7 @@ the below steps to do a no downtime transfer to a new storage location. ...@@ -501,7 +501,7 @@ the below steps to do a no downtime transfer to a new storage location.
1. Pause Pages deployments by setting the following in `/etc/gitlab/gitlab.rb`: 1. Pause Pages deployments by setting the following in `/etc/gitlab/gitlab.rb`:
```ruby ```ruby
sidekiq['experimental_queue_selector'] = true sidekiq['queue_selector'] = true
sidekiq['queue_groups'] = [ sidekiq['queue_groups'] = [
"feature_category!=pages" "feature_category!=pages"
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment