konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MEDIUM: trace: fix a typo causing an incorrect startup error

Browse Source 
Since commit 88ebd40 ("MINOR: trace: add allocation of buffer-sized
trace buffers") we have a trace buffer allocated at boot time. But
there was a copy-paste error there making the test verify that the
trash was allocated instead of the trace buffer. The result is that
depending on the link order either the test will succeed or fail,
preventing haproxy from starting at all.

No backport is needed.
This commit is contained in:
Willy Tarreau 2019-11-25 19:43:31 +01:00
parent 1a3af78302
commit 2e7fdfc9a1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/trace.c
View File

@ -37,7 +37,7 @@ THREAD_LOCAL struct buffer trace_buf = { };
static int alloc_trace_buffers_per_thread()
{
chunk_init(&trace_buf, my_realloc2(trace_buf.area, global.tune.bufsize), global.tune.bufsize);
return !!trash.area;
return !!trace_buf.area;
}
static void free_trace_buffers_per_thread()