From ad050f7e5523462b0e78a41876643425b872e115 Mon Sep 17 00:00:00 2001 From: Simon Street Date: Tue, 30 May 2023 13:11:24 +0100 Subject: [PATCH 1/6] Fix load balancing configuration gitlab_rails['db_load_balancing'] should only contain secondaries See https://docs.gitlab.com/ee/administration/postgresql/database_load_balancing.html --- doc/administration/reference_architectures/10k_users.md | 4 ++-- doc/administration/reference_architectures/25k_users.md | 4 ++-- doc/administration/reference_architectures/3k_users.md | 4 ++-- doc/administration/reference_architectures/50k_users.md | 4 ++-- doc/administration/reference_architectures/5k_users.md | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index ca79fb47aef67f..eb50d4f8b363f5 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -1827,7 +1827,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.40' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1961,7 +1961,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 75d7a897e1ab5d..1d238068f609b4 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -1844,7 +1844,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1980,7 +1980,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index 1116a3f2cf0bcd..fd0a873d53d373 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -1769,7 +1769,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.40' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.32', '10.6.0.33'] } # PostgreSQL Secondary IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1912,7 +1912,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.32', '10.6.0.33'] } # PostgreSQL Secondary IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index c3ad595ae54305..04c72ff42e716f 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -1840,7 +1840,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1983,7 +1983,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index fe95da486c4a36..b7eb1505710dba 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -1758,7 +1758,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.40' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.32', '10.6.0.33'] } # PostgreSQL Secondary IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1901,7 +1901,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.32', '10.6.0.33'] } # PostgreSQL Secondary IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false -- GitLab From 4ff3f7420fbedeeface11b2a5b6d5554729586e7 Mon Sep 17 00:00:00 2001 From: Simon Street Date: Tue, 30 May 2023 13:12:20 +0100 Subject: [PATCH 2/6] Fix internal load balancer configuration The internal load balancer should connect to pgbouncer not the database --- doc/administration/reference_architectures/10k_users.md | 6 +++--- doc/administration/reference_architectures/25k_users.md | 6 +++--- doc/administration/reference_architectures/50k_users.md | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index eb50d4f8b363f5..3732573740ee18 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -381,9 +381,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.21:6432 check - server pgbouncer2 10.6.0.22:6432 check - server pgbouncer3 10.6.0.23:6432 check + server pgbouncer1 10.6.0.31:6432 check + server pgbouncer2 10.6.0.32:6432 check + server pgbouncer3 10.6.0.33:6432 check backend praefect mode tcp diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 1d238068f609b4..e87361b2b3a2a8 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -392,9 +392,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.21:6432 check - server pgbouncer2 10.6.0.22:6432 check - server pgbouncer3 10.6.0.23:6432 check + server pgbouncer1 10.6.0.31:6432 check + server pgbouncer2 10.6.0.32:6432 check + server pgbouncer3 10.6.0.33:6432 check backend praefect mode tcp diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index 04c72ff42e716f..a89ad18c838eda 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -390,9 +390,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.21:6432 check - server pgbouncer2 10.6.0.22:6432 check - server pgbouncer3 10.6.0.23:6432 check + server pgbouncer1 10.6.0.31:6432 check + server pgbouncer2 10.6.0.32:6432 check + server pgbouncer3 10.6.0.33:6432 check backend praefect mode tcp -- GitLab From 77d8d4bf5442ca3629e523e5220844b749879fc8 Mon Sep 17 00:00:00 2001 From: Simon Street Date: Wed, 7 Jun 2023 16:48:21 +0100 Subject: [PATCH 3/6] Revert "Fix internal load balancer configuration" This reverts commit 5b4115f2d738abd6276d3988cd81070e801be0e3. --- doc/administration/reference_architectures/10k_users.md | 6 +++--- doc/administration/reference_architectures/25k_users.md | 6 +++--- doc/administration/reference_architectures/50k_users.md | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index 3732573740ee18..eb50d4f8b363f5 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -381,9 +381,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.31:6432 check - server pgbouncer2 10.6.0.32:6432 check - server pgbouncer3 10.6.0.33:6432 check + server pgbouncer1 10.6.0.21:6432 check + server pgbouncer2 10.6.0.22:6432 check + server pgbouncer3 10.6.0.23:6432 check backend praefect mode tcp diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index e87361b2b3a2a8..1d238068f609b4 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -392,9 +392,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.31:6432 check - server pgbouncer2 10.6.0.32:6432 check - server pgbouncer3 10.6.0.33:6432 check + server pgbouncer1 10.6.0.21:6432 check + server pgbouncer2 10.6.0.22:6432 check + server pgbouncer3 10.6.0.23:6432 check backend praefect mode tcp diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index a89ad18c838eda..04c72ff42e716f 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -390,9 +390,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.31:6432 check - server pgbouncer2 10.6.0.32:6432 check - server pgbouncer3 10.6.0.33:6432 check + server pgbouncer1 10.6.0.21:6432 check + server pgbouncer2 10.6.0.22:6432 check + server pgbouncer3 10.6.0.23:6432 check backend praefect mode tcp -- GitLab From b91af641ff7635bc4f0f0f6d517e6b8d2f8032d3 Mon Sep 17 00:00:00 2001 From: Simon Street Date: Wed, 7 Jun 2023 16:48:36 +0100 Subject: [PATCH 4/6] Revert "Fix load balancing configuration" This reverts commit b8124b31c8c30c8f0d0a556e6fa2ea5e48b387fc. --- doc/administration/reference_architectures/10k_users.md | 4 ++-- doc/administration/reference_architectures/25k_users.md | 4 ++-- doc/administration/reference_architectures/3k_users.md | 4 ++-- doc/administration/reference_architectures/50k_users.md | 4 ++-- doc/administration/reference_architectures/5k_users.md | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index eb50d4f8b363f5..ca79fb47aef67f 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -1827,7 +1827,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.40' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1961,7 +1961,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 1d238068f609b4..75d7a897e1ab5d 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -1844,7 +1844,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1980,7 +1980,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index fd0a873d53d373..1116a3f2cf0bcd 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -1769,7 +1769,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.40' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.32', '10.6.0.33'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1912,7 +1912,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.32', '10.6.0.33'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index 04c72ff42e716f..c3ad595ae54305 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -1840,7 +1840,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1983,7 +1983,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.22', '10.6.0.23'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index b7eb1505710dba..fe95da486c4a36 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -1758,7 +1758,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.40' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.32', '10.6.0.33'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1901,7 +1901,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.32', '10.6.0.33'] } # PostgreSQL Secondary IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false -- GitLab From f3fbb52f9041891550d39f226bb1e7a7a14128e4 Mon Sep 17 00:00:00 2001 From: Simon Street Date: Wed, 7 Jun 2023 17:17:54 +0100 Subject: [PATCH 5/6] Sync database related IP/server list across reference architectures --- .../reference_architectures/3k_users.md | 18 +++++++++--------- .../reference_architectures/5k_users.md | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index 1116a3f2cf0bcd..349a761805a861 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -180,19 +180,19 @@ connect to each other freely on these addresses. The following list includes descriptions of each server and its assigned IP: - `10.6.0.10`: External Load Balancer -- `10.6.0.61`: Redis Primary -- `10.6.0.62`: Redis Replica 1 -- `10.6.0.63`: Redis Replica 2 - `10.6.0.11`: Consul/Sentinel 1 - `10.6.0.12`: Consul/Sentinel 2 - `10.6.0.13`: Consul/Sentinel 3 -- `10.6.0.31`: PostgreSQL primary -- `10.6.0.32`: PostgreSQL secondary 1 -- `10.6.0.33`: PostgreSQL secondary 2 -- `10.6.0.21`: PgBouncer 1 -- `10.6.0.22`: PgBouncer 2 -- `10.6.0.23`: PgBouncer 3 +- `10.6.0.21`: PostgreSQL primary +- `10.6.0.22`: PostgreSQL secondary 1 +- `10.6.0.23`: PostgreSQL secondary 2 +- `10.6.0.31`: PgBouncer 1 +- `10.6.0.32`: PgBouncer 2 +- `10.6.0.33`: PgBouncer 3 - `10.6.0.20`: Internal Load Balancer +- `10.6.0.61`: Redis Primary +- `10.6.0.62`: Redis Replica 1 +- `10.6.0.63`: Redis Replica 2 - `10.6.0.51`: Gitaly 1 - `10.6.0.52`: Gitaly 2 - `10.6.0.93`: Gitaly 3 diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index fe95da486c4a36..15a6bbfb3abe4b 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -177,19 +177,19 @@ connect to each other freely on these addresses. The following list includes descriptions of each server and its assigned IP: - `10.6.0.10`: External Load Balancer -- `10.6.0.61`: Redis Primary -- `10.6.0.62`: Redis Replica 1 -- `10.6.0.63`: Redis Replica 2 - `10.6.0.11`: Consul/Sentinel 1 - `10.6.0.12`: Consul/Sentinel 2 - `10.6.0.13`: Consul/Sentinel 3 -- `10.6.0.31`: PostgreSQL primary -- `10.6.0.32`: PostgreSQL secondary 1 -- `10.6.0.33`: PostgreSQL secondary 2 -- `10.6.0.21`: PgBouncer 1 -- `10.6.0.22`: PgBouncer 2 -- `10.6.0.23`: PgBouncer 3 +- `10.6.0.21`: PostgreSQL primary +- `10.6.0.22`: PostgreSQL secondary 1 +- `10.6.0.23`: PostgreSQL secondary 2 +- `10.6.0.31`: PgBouncer 1 +- `10.6.0.32`: PgBouncer 2 +- `10.6.0.33`: PgBouncer 3 - `10.6.0.20`: Internal Load Balancer +- `10.6.0.61`: Redis Primary +- `10.6.0.62`: Redis Replica 1 +- `10.6.0.63`: Redis Replica 2 - `10.6.0.51`: Gitaly 1 - `10.6.0.52`: Gitaly 2 - `10.6.0.93`: Gitaly 3 -- GitLab From b51bfe6bc3c3722fb4a12d23dc01723c8ac7cec8 Mon Sep 17 00:00:00 2001 From: Simon Street Date: Wed, 7 Jun 2023 17:29:05 +0100 Subject: [PATCH 6/6] Update configuration examples to match synced IP lists - Fix internal load balancer pgbouncer config - Fix `gitlab-ctl patroni members` output in 3/5k - Fix 'The following IPs are used as an example' for pgsql in 3/5k - Fix `gitlab_rails['db_load_balancing']` in 3/5k --- .../reference_architectures/10k_users.md | 6 ++-- .../reference_architectures/25k_users.md | 6 ++-- .../reference_architectures/3k_users.md | 34 +++++++++---------- .../reference_architectures/50k_users.md | 6 ++-- .../reference_architectures/5k_users.md | 28 +++++++-------- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index ca79fb47aef67f..f114a4a50c5f93 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -381,9 +381,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.21:6432 check - server pgbouncer2 10.6.0.22:6432 check - server pgbouncer3 10.6.0.23:6432 check + server pgbouncer1 10.6.0.31:6432 check + server pgbouncer2 10.6.0.32:6432 check + server pgbouncer3 10.6.0.33:6432 check backend praefect mode tcp diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 75d7a897e1ab5d..7ac5d1fadbef66 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -392,9 +392,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.21:6432 check - server pgbouncer2 10.6.0.22:6432 check - server pgbouncer3 10.6.0.23:6432 check + server pgbouncer1 10.6.0.31:6432 check + server pgbouncer2 10.6.0.32:6432 check + server pgbouncer3 10.6.0.33:6432 check backend praefect mode tcp diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index 349a761805a861..705b06e00f7bdb 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -392,9 +392,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.21:6432 check - server pgbouncer2 10.6.0.22:6432 check - server pgbouncer3 10.6.0.23:6432 check + server pgbouncer1 10.6.0.31:6432 check + server pgbouncer2 10.6.0.32:6432 check + server pgbouncer3 10.6.0.33:6432 check backend praefect mode tcp @@ -816,9 +816,9 @@ replication and failover requires: The following IPs will be used as an example: -- `10.6.0.31`: PostgreSQL primary -- `10.6.0.32`: PostgreSQL secondary 1 -- `10.6.0.33`: PostgreSQL secondary 2 +- `10.6.0.21`: PostgreSQL primary +- `10.6.0.22`: PostgreSQL secondary 1 +- `10.6.0.23`: PostgreSQL secondary 2 First, make sure to [install](https://about.gitlab.com/install/) the Linux GitLab package **on each node**. Following the steps, @@ -969,9 +969,9 @@ SSH in to any of the Patroni nodes on the **primary site**: ```plaintext | Cluster | Member | Host | Role | State | TL | Lag in MB | Pending restart | |---------------|-----------------------------------|-----------|--------|---------|-----|-----------|-----------------| - | postgresql-ha | | 10.6.0.31 | Leader | running | 175 | | * | - | postgresql-ha | | 10.6.0.32 | | running | 175 | 0 | * | - | postgresql-ha | | 10.6.0.33 | | running | 175 | 0 | * | + | postgresql-ha | | 10.6.0.21 | Leader | running | 175 | | * | + | postgresql-ha | | 10.6.0.22 | | running | 175 | 0 | * | + | postgresql-ha | | 10.6.0.23 | | running | 175 | 0 | * | ``` If the 'State' column for any node doesn't say "running", check the @@ -991,9 +991,9 @@ for tracking and handling reads/writes to the primary database. The following IPs will be used as an example: -- `10.6.0.21`: PgBouncer 1 -- `10.6.0.22`: PgBouncer 2 -- `10.6.0.23`: PgBouncer 3 +- `10.6.0.31`: PgBouncer 1 +- `10.6.0.32`: PgBouncer 2 +- `10.6.0.33`: PgBouncer 3 1. On each PgBouncer node, edit `/etc/gitlab/gitlab.rb`, and replace `` and `` with the @@ -1769,7 +1769,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.40' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1912,7 +1912,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -2115,9 +2115,9 @@ running [Prometheus](../monitoring/prometheus/index.md) and 'job_name': 'pgbouncer', 'static_configs' => [ 'targets' => [ - "10.6.0.21:9188", - "10.6.0.22:9188", - "10.6.0.23:9188", + "10.6.0.31:9188", + "10.6.0.32:9188", + "10.6.0.33:9188", ], ], }, diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index c3ad595ae54305..54a57a92aa2d47 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -390,9 +390,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.21:6432 check - server pgbouncer2 10.6.0.22:6432 check - server pgbouncer3 10.6.0.23:6432 check + server pgbouncer1 10.6.0.31:6432 check + server pgbouncer2 10.6.0.32:6432 check + server pgbouncer3 10.6.0.33:6432 check backend praefect mode tcp diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index 15a6bbfb3abe4b..873d269d44bcb2 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -389,9 +389,9 @@ backend pgbouncer mode tcp option tcp-check - server pgbouncer1 10.6.0.21:6432 check - server pgbouncer2 10.6.0.22:6432 check - server pgbouncer3 10.6.0.23:6432 check + server pgbouncer1 10.6.0.31:6432 check + server pgbouncer2 10.6.0.32:6432 check + server pgbouncer3 10.6.0.33:6432 check backend praefect mode tcp @@ -809,9 +809,9 @@ replication and failover requires: The following IPs are used as an example: -- `10.6.0.31`: PostgreSQL primary -- `10.6.0.32`: PostgreSQL secondary 1 -- `10.6.0.33`: PostgreSQL secondary 2 +- `10.6.0.21`: PostgreSQL primary +- `10.6.0.22`: PostgreSQL secondary 1 +- `10.6.0.23`: PostgreSQL secondary 2 First, make sure to [install](https://about.gitlab.com/install/) the Linux GitLab package **on each node**. Following the steps, @@ -962,9 +962,9 @@ SSH in to any of the Patroni nodes on the **primary site**: ```plaintext | Cluster | Member | Host | Role | State | TL | Lag in MB | Pending restart | |---------------|-----------------------------------|-----------|--------|---------|-----|-----------|-----------------| - | postgresql-ha | | 10.6.0.31 | Leader | running | 175 | | * | - | postgresql-ha | | 10.6.0.32 | | running | 175 | 0 | * | - | postgresql-ha | | 10.6.0.33 | | running | 175 | 0 | * | + | postgresql-ha | | 10.6.0.21 | Leader | running | 175 | | * | + | postgresql-ha | | 10.6.0.22 | | running | 175 | 0 | * | + | postgresql-ha | | 10.6.0.23 | | running | 175 | 0 | * | ``` If the 'State' column for any node doesn't say "running", check the @@ -984,9 +984,9 @@ for tracking and handling reads/writes to the primary database. The following IPs are used as an example: -- `10.6.0.21`: PgBouncer 1 -- `10.6.0.22`: PgBouncer 2 -- `10.6.0.23`: PgBouncer 3 +- `10.6.0.31`: PgBouncer 1 +- `10.6.0.32`: PgBouncer 2 +- `10.6.0.33`: PgBouncer 3 1. On each PgBouncer node, edit `/etc/gitlab/gitlab.rb`, and replace `` and `` with the @@ -1758,7 +1758,7 @@ Updates to example must be made at: gitlab_rails['db_host'] = '10.6.0.40' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs ## Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false @@ -1901,7 +1901,7 @@ On each node perform the following: gitlab_rails['db_host'] = '10.6.0.20' # internal load balancer IP gitlab_rails['db_port'] = 6432 gitlab_rails['db_password'] = '' - gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.31', '10.6.0.32', '10.6.0.33'] } # PostgreSQL IPs + gitlab_rails['db_load_balancing'] = { 'hosts' => ['10.6.0.21', '10.6.0.22', '10.6.0.23'] } # PostgreSQL IPs # Prevent database migrations from running on upgrade automatically gitlab_rails['auto_migrate'] = false -- GitLab