Skip to content

Commit 56373d1

Browse files
Darleletcapflam
authored andcommitted
DOC: config: move "hash-key" from proxy to server options
As reported by Ashley Morris, "hash-key" keyword which was introduced in commit faa8c3e ("MEDIUM: lb-chash: Deterministic node hashes based on server address") doesn't belong to proxy keywords and should be found in 5.2 "Server and default-server options" instead. It should be backported in 3.0 with faa8c3e (cherry picked from commit cdf1d20) Signed-off-by: Christopher Faulet <[email protected]>
1 parent d1a7330 commit 56373d1

File tree

1 file changed

+22
-24
lines changed

1 file changed

+22
-24
lines changed

doc/configuration.txt

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5190,7 +5190,6 @@ filter - X X X
51905190
fullconn X - X X
51915191
guid - X X X
51925192
hash-balance-factor X - X X
5193-
hash-key X - X X
51945193
hash-type X - X X
51955194
http-after-response X (!) X X X
51965195
http-check comment X - X X
@@ -6994,29 +6993,6 @@ hash-balance-factor <factor>
69946993
See also : "balance" and "hash-type".
69956994

69966995

6997-
hash-key <key>
6998-
Specify how "hash-type consistent" node keys are computed
6999-
7000-
Arguments :
7001-
<key> <key> may be one of the following :
7002-
7003-
id The node keys will be derived from the server's numeric
7004-
identifier as set from "id" or which defaults to its position
7005-
in the server list.
7006-
7007-
addr The node keys will be derived from the server's address, when
7008-
available, or else fall back on "id".
7009-
7010-
addr-port The node keys will be derived from the server's address and
7011-
port, when available, or else fall back on "id".
7012-
7013-
The "addr" and "addr-port" options may be useful in scenarios where multiple
7014-
HAProxy processes are balancing traffic to the same set of servers. If the
7015-
server order of each process is different (because, for example, DNS records
7016-
were resolved in different orders) then this will allow each independent
7017-
HAProxy processes to agree on routing decisions.
7018-
7019-
70206996
hash-type <method> <function> <modifier>
70216997
Specify a method to use for mapping hashes to servers
70226998

@@ -17178,6 +17154,28 @@ guid <string>
1717817154
unique across all haproxy configuration on every object types. See "guid"
1717917155
proxy keyword description for more information on its format.
1718017156

17157+
hash-key <key>
17158+
Specify how "hash-type consistent" node keys are computed
17159+
17160+
Arguments :
17161+
<key> <key> may be one of the following :
17162+
17163+
id The node keys will be derived from the server's numeric
17164+
identifier as set from "id" or which defaults to its position
17165+
in the server list.
17166+
17167+
addr The node keys will be derived from the server's address, when
17168+
available, or else fall back on "id".
17169+
17170+
addr-port The node keys will be derived from the server's address and
17171+
port, when available, or else fall back on "id".
17172+
17173+
The "addr" and "addr-port" options may be useful in scenarios where multiple
17174+
HAProxy processes are balancing traffic to the same set of servers. If the
17175+
server order of each process is different (because, for example, DNS records
17176+
were resolved in different orders) then this will allow each independent
17177+
HAProxy processes to agree on routing decisions.
17178+
1718117179
id <value>
1718217180
May be used in the following contexts: tcp, http, log
1718317181

0 commit comments

Comments
 (0)