mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: dynbuf/stream: re-enable queueing upon failed buffer allocation

Browse Source 
The errors were not working fine anyway since we know that upon low memory
condition everything freezes. However we have a chance to do better now,
so let's start by re-enabling queueing when allocations fail.
This commit is contained in:
Willy Tarreau 2024-04-29 08:52:40 +02:00
parent f5566afec6
commit db21062881
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/stream.c
View File

@ -753,6 +753,8 @@ static int stream_alloc_work_buffer(struct stream *s)
{ {
if (b_alloc(&s->res.buf, DB_CHANNEL)) if (b_alloc(&s->res.buf, DB_CHANNEL))
return 1; return 1;
b_requeue(DB_CHANNEL, &s->buffer_wait);
return 0; return 0;
} }
@ -1793,25 +1795,12 @@ struct task *process_stream(struct task *t, void *context, unsigned int state)
} }
resync_stconns: resync_stconns:
/* below we may emit error messages so we have to ensure that we have
* our buffers properly allocated. If the allocation failed, an error is
* triggered.
*
* NOTE: An error is returned because the mechanism to queue entities
* waiting for a buffer is totally broken for now. However, this
* part must be refactored. When it will be handled, this part
* must be be reviewed too.
*/
if (!stream_alloc_work_buffer(s)) { if (!stream_alloc_work_buffer(s)) {
scf->flags |= SC_FL_ERROR; scf->flags &= ~SC_FL_DONT_WAKE;
s->conn_err_type = STRM_ET_CONN_RES; scb->flags &= ~SC_FL_DONT_WAKE;
/* we're stuck for now */
scb->flags |= SC_FL_ERROR; t->expire = TICK_ETERNITY;
s->conn_err_type = STRM_ET_CONN_RES; goto leave;
if (!(s->flags & SF_ERR_MASK))
s->flags |= SF_ERR_RESOURCE;
sess_set_term_flags(s);
} }
/* 1b: check for low-level errors reported at the stream connector. /* 1b: check for low-level errors reported at the stream connector.
@ -2551,7 +2540,7 @@ struct task *process_stream(struct task *t, void *context, unsigned int state)
stream_handle_timeouts(s); stream_handle_timeouts(s);
goto resync_stconns; goto resync_stconns;
} }
leave:
s->pending_events &= ~(TASK_WOKEN_TIMER | TASK_WOKEN_RES); s->pending_events &= ~(TASK_WOKEN_TIMER | TASK_WOKEN_RES);
stream_release_buffers(s); stream_release_buffers(s);