Merge ~hloeung/content-cache-charm:haproxy-config into content-cache-charm:master
- Git
- lp:~hloeung/content-cache-charm
- haproxy-config
- Merge into master
Proposed by
Haw Loeung
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Haw Loeung | ||||
Approved revision: | a881402121976451b02aa5411cf55c101af0e830 | ||||
Merged at revision: | 3fa38babb591d1d9a17ae56a49661cb01cbf7f2b | ||||
Proposed branch: | ~hloeung/content-cache-charm:haproxy-config | ||||
Merge into: | content-cache-charm:master | ||||
Diff against target: |
322 lines (+38/-31) 7 files modified
lib/haproxy.py (+6/-2) reactive/content_cache.py (+3/-0) tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+9/-9) tests/unit/files/content_cache_rendered_haproxy_test_output2.txt (+1/-1) tests/unit/files/content_cache_rendered_haproxy_test_output3.txt (+1/-1) tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt (+9/-9) tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt (+9/-9) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Joel Sing (community) | +1 | Approve | |
Canonical IS Reviewers | Pending | ||
Review via email: mp+390518@code.launchpad.net |
Commit message
Use higher HAProxy fall count for caching layer - LP:1891273
Description of the change
To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : | # |
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : | # |
Change successfully merged at revision 3fa38babb591d1d
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/lib/haproxy.py b/lib/haproxy.py |
2 | index 33c0c3b..c3f3a76 100644 |
3 | --- a/lib/haproxy.py |
4 | +++ b/lib/haproxy.py |
5 | @@ -233,6 +233,8 @@ backend backend-{name} |
6 | ' ca-file ca-certificates.crt'.format(site_name=site_name) |
7 | ) |
8 | inter_time = loc_conf.get('backend-inter-time', '5s') |
9 | + fall_count = loc_conf.get('backend-fall-count', 5) |
10 | + rise_count = loc_conf.get('backend-rise-count', 2) |
11 | maxconn = loc_conf.get('backend-maxconn', 2048) |
12 | method = loc_conf.get('backend-check-method', 'HEAD') |
13 | path = loc_conf.get('backend-check-path', '/') |
14 | @@ -258,12 +260,14 @@ backend backend-{name} |
15 | except utils.InvalidAddressPortError: |
16 | use_resolvers = ' resolvers dns init-addr none' |
17 | backend_confs.append( |
18 | - '{indent}server {name} {backend}{use_resolvers} check inter {inter_time} rise 2 fall 5 ' |
19 | - 'maxconn {maxconn}{tls}'.format( |
20 | + '{indent}server {name} {backend}{use_resolvers} check inter {inter_time} ' |
21 | + 'rise {rise_count} fall {fall_count} maxconn {maxconn}{tls}'.format( |
22 | name=name, |
23 | backend=backend, |
24 | use_resolvers=use_resolvers, |
25 | inter_time=inter_time, |
26 | + fall_count=fall_count, |
27 | + rise_count=rise_count, |
28 | maxconn=maxconn, |
29 | tls=tls_config, |
30 | indent=INDENT, |
31 | diff --git a/reactive/content_cache.py b/reactive/content_cache.py |
32 | index fc6b637..97ce35f 100644 |
33 | --- a/reactive/content_cache.py |
34 | +++ b/reactive/content_cache.py |
35 | @@ -256,6 +256,9 @@ def configure_haproxy(): # NOQA: C901 LP#1825084 |
36 | # 2s no matter what. This is so it'll notice when the |
37 | # caching layer (nginx) is back up quicker. |
38 | new_cached_loc_conf['backend-inter-time'] = '2s' |
39 | + # Also, for caching layer, we want higher fall count as it's less |
40 | + # likely the caching layer is down, 2 mins here (inter * fall). |
41 | + new_cached_loc_conf['backend-fall-count'] = 60 |
42 | new_cached_loc_conf['backend-options'] = ['forwardfor'] |
43 | |
44 | # No backends |
45 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt |
46 | index 775bc5f..ed46f09 100644 |
47 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt |
48 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt |
49 | @@ -142,7 +142,7 @@ backend backend-cached-site1-local |
50 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
51 | http-request set-header Host site1.local |
52 | balance leastconn |
53 | - server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 5 maxconn 2048 |
54 | + server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 2048 |
55 | |
56 | backend backend-site1-local |
57 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
58 | @@ -157,7 +157,7 @@ backend backend-cached-site2-local |
59 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
60 | http-request set-header Host site2.local |
61 | balance leastconn |
62 | - server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 5 maxconn 2048 |
63 | + server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 2048 |
64 | |
65 | backend backend-site2-local |
66 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
67 | @@ -172,7 +172,7 @@ backend backend-cached-site3-local |
68 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
69 | http-request set-header Host site3.local |
70 | balance leastconn |
71 | - server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 5 maxconn 4096 |
72 | + server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
73 | |
74 | backend backend-site3-local |
75 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
76 | @@ -187,14 +187,14 @@ backend backend-cached-site4-local |
77 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
78 | http-request set-header Host site4.local |
79 | balance leastconn |
80 | - server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 5 maxconn 2048 |
81 | + server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 2048 |
82 | |
83 | backend backend-cached-site5 |
84 | option forwardfor |
85 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
86 | http-request set-header Host site5.local |
87 | balance leastconn |
88 | - server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 5 maxconn 2048 |
89 | + server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 2048 |
90 | |
91 | backend backend-site5 |
92 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
93 | @@ -213,7 +213,7 @@ backend backend-cached-site6-local |
94 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
95 | http-request set-header Host site6.local |
96 | balance leastconn |
97 | - server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 5 maxconn 2048 |
98 | + server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 2048 |
99 | |
100 | backend backend-site6-local |
101 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
102 | @@ -226,7 +226,7 @@ backend backend-cached-site7-local |
103 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
104 | http-request set-header Host site7.local |
105 | balance leastconn |
106 | - server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 5 maxconn 2048 |
107 | + server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 2048 |
108 | |
109 | backend backend-site7-local |
110 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
111 | @@ -239,7 +239,7 @@ backend backend-cached-site8-local |
112 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
113 | http-request set-header Host site8.local |
114 | balance leastconn |
115 | - server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 5 maxconn 2048 |
116 | + server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 2048 |
117 | |
118 | backend backend-site8-local |
119 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
120 | @@ -258,7 +258,7 @@ backend backend-cached-site9-local |
121 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
122 | http-request set-header Host site9.local |
123 | balance leastconn |
124 | - server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 5 maxconn 2048 |
125 | + server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 2048 |
126 | |
127 | backend backend-site9-local |
128 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
129 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt |
130 | index 0ef9fd0..354c281 100644 |
131 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt |
132 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt |
133 | @@ -88,7 +88,7 @@ backend backend-cached-site1-local |
134 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
135 | http-request set-header Host site1.local |
136 | balance leastconn |
137 | - server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 5 maxconn 2048 |
138 | + server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 2048 |
139 | |
140 | backend backend-site1-local |
141 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
142 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt |
143 | index 43c80e7..8020408 100644 |
144 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt |
145 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt |
146 | @@ -93,7 +93,7 @@ backend backend-cached-site1-local |
147 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
148 | http-request set-header Host site1.local |
149 | balance leastconn |
150 | - server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 5 maxconn 2048 |
151 | + server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 2048 |
152 | |
153 | backend backend-site1-local |
154 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
155 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt |
156 | index 222ccc7..dc7ee1f 100644 |
157 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt |
158 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt |
159 | @@ -142,7 +142,7 @@ backend backend-cached-site1-local |
160 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
161 | http-request set-header Host site1.local |
162 | balance leastconn |
163 | - server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 5 maxconn 2048 |
164 | + server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 2048 |
165 | |
166 | backend backend-site1-local |
167 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
168 | @@ -157,7 +157,7 @@ backend backend-cached-site2-local |
169 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
170 | http-request set-header Host site2.local |
171 | balance leastconn |
172 | - server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 5 maxconn 2048 |
173 | + server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 2048 |
174 | |
175 | backend backend-site2-local |
176 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
177 | @@ -172,7 +172,7 @@ backend backend-cached-site3-local |
178 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
179 | http-request set-header Host site3.local |
180 | balance leastconn |
181 | - server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 5 maxconn 4096 |
182 | + server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
183 | |
184 | backend backend-site3-local |
185 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
186 | @@ -187,14 +187,14 @@ backend backend-cached-site4-local |
187 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
188 | http-request set-header Host site4.local |
189 | balance leastconn |
190 | - server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 5 maxconn 2048 |
191 | + server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 2048 |
192 | |
193 | backend backend-cached-site5 |
194 | option forwardfor |
195 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
196 | http-request set-header Host site5.local |
197 | balance leastconn |
198 | - server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 5 maxconn 2048 |
199 | + server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 2048 |
200 | |
201 | backend backend-site5 |
202 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
203 | @@ -213,7 +213,7 @@ backend backend-cached-site6-local |
204 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
205 | http-request set-header Host site6.local |
206 | balance leastconn |
207 | - server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 5 maxconn 2048 |
208 | + server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 2048 |
209 | |
210 | backend backend-site6-local |
211 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
212 | @@ -226,7 +226,7 @@ backend backend-cached-site7-local |
213 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
214 | http-request set-header Host site7.local |
215 | balance leastconn |
216 | - server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 5 maxconn 2048 |
217 | + server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 2048 |
218 | |
219 | backend backend-site7-local |
220 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
221 | @@ -239,7 +239,7 @@ backend backend-cached-site8-local |
222 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
223 | http-request set-header Host site8.local |
224 | balance leastconn |
225 | - server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 5 maxconn 2048 |
226 | + server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 2048 |
227 | |
228 | backend backend-site8-local |
229 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
230 | @@ -258,7 +258,7 @@ backend backend-cached-site9-local |
231 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
232 | http-request set-header Host site9.local |
233 | balance leastconn |
234 | - server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 5 maxconn 2048 |
235 | + server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 2048 |
236 | |
237 | backend backend-site9-local |
238 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
239 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt |
240 | index 91c8ca1..3593b89 100644 |
241 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt |
242 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt |
243 | @@ -143,7 +143,7 @@ backend backend-cached-site1-local |
244 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
245 | http-request set-header Host site1.local |
246 | balance leastconn |
247 | - server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 5 maxconn 2048 |
248 | + server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 2048 |
249 | |
250 | backend backend-site1-local |
251 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
252 | @@ -158,7 +158,7 @@ backend backend-cached-site2-local |
253 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
254 | http-request set-header Host site2.local |
255 | balance leastconn |
256 | - server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 5 maxconn 2048 |
257 | + server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 2048 |
258 | |
259 | backend backend-site2-local |
260 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
261 | @@ -173,7 +173,7 @@ backend backend-cached-site3-local |
262 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
263 | http-request set-header Host site3.local |
264 | balance leastconn |
265 | - server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 5 maxconn 4096 |
266 | + server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
267 | |
268 | backend backend-site3-local |
269 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
270 | @@ -188,14 +188,14 @@ backend backend-cached-site4-local |
271 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
272 | http-request set-header Host site4.local |
273 | balance leastconn |
274 | - server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 5 maxconn 2048 |
275 | + server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 2048 |
276 | |
277 | backend backend-cached-site5 |
278 | option forwardfor |
279 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
280 | http-request set-header Host site5.local |
281 | balance leastconn |
282 | - server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 5 maxconn 2048 |
283 | + server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 2048 |
284 | |
285 | backend backend-site5 |
286 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
287 | @@ -214,7 +214,7 @@ backend backend-cached-site6-local |
288 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
289 | http-request set-header Host site6.local |
290 | balance leastconn |
291 | - server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 5 maxconn 2048 |
292 | + server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 2048 |
293 | |
294 | backend backend-site6-local |
295 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
296 | @@ -227,7 +227,7 @@ backend backend-cached-site7-local |
297 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
298 | http-request set-header Host site7.local |
299 | balance leastconn |
300 | - server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 5 maxconn 2048 |
301 | + server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 2048 |
302 | |
303 | backend backend-site7-local |
304 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
305 | @@ -240,7 +240,7 @@ backend backend-cached-site8-local |
306 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
307 | http-request set-header Host site8.local |
308 | balance leastconn |
309 | - server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 5 maxconn 2048 |
310 | + server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 2048 |
311 | |
312 | backend backend-site8-local |
313 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
314 | @@ -259,7 +259,7 @@ backend backend-cached-site9-local |
315 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
316 | http-request set-header Host site9.local |
317 | balance leastconn |
318 | - server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 5 maxconn 2048 |
319 | + server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 2048 |
320 | |
321 | backend backend-site9-local |
322 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache |
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.