diff --git a/changelog/66888.fixed.md b/changelog/66888.fixed.md new file mode 100644 index 00000000000..5284693b05d --- /dev/null +++ b/changelog/66888.fixed.md @@ -0,0 +1 @@ +Update master cluster tutorial haproxy config with proper timeouts for publish port diff --git a/doc/topics/tutorials/master-cluster.rst b/doc/topics/tutorials/master-cluster.rst index 4bd2ce7793f..7b7ae25f11d 100644 --- a/doc/topics/tutorials/master-cluster.rst +++ b/doc/topics/tutorials/master-cluster.rst @@ -45,18 +45,20 @@ HAProxy: mode tcp bind 10.27.5.116:4505 option tcplog - timeout client 1m + # This timeout is equal to the publish_session setting of the + # masters. + timeout client 86400s default_backend salt-master-pub-backend backend salt-master-pub-backend mode tcp - option tcplog #option log-health-checks log global - #balance source balance roundrobin timeout connect 10s - timeout server 1m + # This timeout is equal to the publish_session setting of the + # masters. + timeout server 86400s server rserve1 10.27.12.13:4505 check server rserve2 10.27.7.126:4505 check server rserve3 10.27.3.73:4505 check @@ -70,11 +72,8 @@ HAProxy: backend salt-master-req-backend mode tcp - option tcplog - #option log-health-checks log global balance roundrobin - #balance source timeout connect 10s timeout server 1m server rserve1 10.27.12.13:4506 check