From 4f404840ef8559e0a39ffb7ce810c4dc82ac3b73 Mon Sep 17 00:00:00 2001 From: Nailia Iskhakova Date: Thu, 1 Feb 2024 15:03:37 +0100 Subject: [PATCH 1/5] Disable Sidekiq on Rails nodes Signed-off-by: Nailia Iskhakova --- doc/administration/reference_architectures/2k_users.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index 8005954d00d329..dbc4a689a258ab 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -783,6 +783,7 @@ On each node perform the following: roles(['application_role']) gitaly['enable'] = false nginx['enable'] = true + sidekiq['enable'] = false ## PostgreSQL connection details gitlab_rails['db_adapter'] = 'postgresql' -- GitLab From 913a637b01dcc9fd0d99597c86c84fcc3e2bdd04 Mon Sep 17 00:00:00 2001 From: Nailia Iskhakova Date: Thu, 1 Feb 2024 15:22:31 +0100 Subject: [PATCH 2/5] Update 2k diagram to include Sidekiq node Signed-off-by: Nailia Iskhakova --- .../reference_architectures/2k_users.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index dbc4a689a258ab..9610c60416f923 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -55,7 +55,11 @@ skinparam linetype ortho card "**External Load Balancer**" as elb #6a9be7 -collections "**GitLab Rails** x2" as gitlab #32CD32 +together { + collections "**GitLab Rails** x2" as gitlab #32CD32 + card "**Sidekiq**" as sidekiq #ff8dd1 +} + card "**Prometheus**" as monitor #7FFFD4 card "**Gitaly**" as gitaly #FF8C00 card "**PostgreSQL**" as postgres #4EA7FF @@ -70,11 +74,17 @@ gitlab -[#32CD32]--> postgres gitlab -[#32CD32]-> object_storage gitlab -[#32CD32]--> redis +sidekiq -[#ff8dd1]r-> object_storage +sidekiq -[#ff8dd1]----> redis +sidekiq .[#ff8dd1]----> postgres +sidekiq -[hidden]-> monitor + monitor .[#7FFFD4]u-> gitlab monitor .[#7FFFD4]-> gitaly monitor .[#7FFFD4]-> postgres monitor .[#7FFFD4,norank]--> redis monitor .[#7FFFD4,norank]u--> elb +monitor .[#7FFFD4]u-> sidekiq @enduml ``` -- GitLab From 4d8064150fe31eb3e986c7a074cb3f31a80de02d Mon Sep 17 00:00:00 2001 From: Nailia Iskhakova Date: Thu, 1 Feb 2024 15:41:08 +0100 Subject: [PATCH 3/5] Add change to update history Signed-off-by: Nailia Iskhakova --- doc/administration/reference_architectures/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/administration/reference_architectures/index.md b/doc/administration/reference_architectures/index.md index 33d3a95a9a50df..361fa657799608 100644 --- a/doc/administration/reference_architectures/index.md +++ b/doc/administration/reference_architectures/index.md @@ -729,6 +729,7 @@ You can find a full history of changes [on the GitLab project](https://gitlab.co **2024:** +- [2024-02](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143539): Adjusted the Sidekiq recommendations on 2k to disable Sidekiq on Rails nodes and updated architecture diagram - [2024-01](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140465): Updated recommendations for Azure for all Reference Architecture sizes and latest cloud services. **2023:** -- GitLab From df9e486fc4818c4012e149a32d113b4008d83c25 Mon Sep 17 00:00:00 2001 From: Nailia Iskhakova Date: Thu, 1 Feb 2024 16:31:38 +0100 Subject: [PATCH 4/5] Remove sidekiq settings from Rails per review Signed-off-by: Nailia Iskhakova --- doc/administration/reference_architectures/2k_users.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index 9610c60416f923..79f7449b741959 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -811,10 +811,6 @@ On each node perform the following: gitlab_workhorse['prometheus_listen_addr'] = '0.0.0.0:9229' puma['listen'] = '0.0.0.0' - # Configure Sidekiq with 2 workers and 20 max concurrency - sidekiq['max_concurrency'] = 20 - sidekiq['queue_groups'] = ['*'] * 2 - # Add the monitoring node's IP address to the monitoring whitelist and allow it to # scrape the NGINX metrics. Replace placeholder `monitoring.gitlab.example.com` with # the address and/or subnets gathered from the monitoring node -- GitLab From 6319885866af6e2bf58574f2684a6648d3124e85 Mon Sep 17 00:00:00 2001 From: Grant Young Date: Thu, 1 Feb 2024 15:33:04 +0000 Subject: [PATCH 5/5] Apply 1 suggestion(s) to 1 file(s) --- doc/administration/reference_architectures/2k_users.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index 79f7449b741959..1c2b39336d475a 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -304,7 +304,7 @@ If you use a third party external service: - `POSTGRESQL_PASSWORD_HASH` - The value output from the previous step - `APPLICATION_SERVER_IP_BLOCKS` - A space delimited list of IP subnets or IP - addresses of the GitLab application servers that will connect to the + addresses of the GitLab Rails and Sidekiq servers that will connect to the database. Example: `%w(123.123.123.123/32 123.123.123.234/32)` ```ruby -- GitLab