summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-08-26 08:32:16 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-08-26 08:32:16 +0000
commite74bf9a8a3c48715c009576907aff544621f37b2 (patch)
tree964ba252ab8288e1bf5cdf0b35c2e33b8de3216c /doc
parent0122ec455c72c635c045eeb65768e7b78534125b (diff)
parent08fcb2379e8e39408a3c2457b036fd6a8c28d5f8 (diff)
downloadgitlab-ce-e74bf9a8a3c48715c009576907aff544621f37b2.tar.gz
Merge branch 'db_load_balancing_service_discovery_srv' into 'master'
DB Load Balancing: Support SRV lookups See merge request gitlab-org/gitlab-ce!32135
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/database_load_balancing.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/administration/database_load_balancing.md b/doc/administration/database_load_balancing.md
index dc4cc401fca..64eca0b00f6 100644
--- a/doc/administration/database_load_balancing.md
+++ b/doc/administration/database_load_balancing.md
@@ -122,6 +122,7 @@ production:
discover:
nameserver: localhost
record: secondary.postgresql.service.consul
+ record_type: A
port: 8600
interval: 60
disconnect_timeout: 120
@@ -137,12 +138,16 @@ The following options can be set:
| Option | Description | Default |
|----------------------|---------------------------------------------------------------------------------------------------|-----------|
| `nameserver` | The nameserver to use for looking up the DNS record. | localhost |
-| `record` | The A record to look up. This option is required for service discovery to work. | |
+| `record` | The record to look up. This option is required for service discovery to work. | |
+| `record_type` | Optional record type to look up, this can be either A or SRV (since GitLab 12.3) | A |
| `port` | The port of the nameserver. | 8600 |
| `interval` | The minimum time in seconds between checking the DNS record. | 60 |
| `disconnect_timeout` | The time in seconds after which an old connection is closed, after the list of hosts was updated. | 120 |
| `use_tcp` | Lookup DNS resources using TCP instead of UDP | false |
+If `record_type` is set to `SRV`, GitLab will continue to use a round-robin algorithm
+and will ignore the `weight` and `priority` in the record.
+
The `interval` value specifies the _minimum_ time between checks. If the A
record has a TTL greater than this value, then service discovery will honor said
TTL. For example, if the TTL of the A record is 90 seconds, then service