RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-03 10:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stats: use stress mode to force reentrant dumps

Browse Source 
Provide alternative code during stats dump when stress mode is active.
The objective is to force the applet to yield on every output line. This
allows to easily test reentrant code paths, in particular while adding
and removing server instances.

To support this, output is interrupted every time the output buffer (or
its equivalent) is not empty. Use COND_STRESS() macro to provide default
and stress alternative conditions.
This commit is contained in:
Amaury Denoyelle 2024-11-07 17:15:47 +01:00
parent 1f458b3ea8
commit ee7241ed18
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/stats.c
View File

@ -60,6 +60,7 @@
#include <haproxy/stats-proxy.h> #include <haproxy/stats-proxy.h>
#include <haproxy/stconn.h> #include <haproxy/stconn.h>
#include <haproxy/stream.h> #include <haproxy/stream.h>
#include <haproxy/stress.h>
#include <haproxy/task.h> #include <haproxy/task.h>
#include <haproxy/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
@ -231,7 +232,8 @@ int stats_putchk(struct appctx *appctx, struct buffer *buf, struct htx *htx)
struct buffer *chk = &ctx->chunk; struct buffer *chk = &ctx->chunk;
if (htx) { if (htx) {
if (b_data(chk) > htx_free_data_space(htx)) { if (STRESS_RUN1(!htx_is_empty(htx),
b_data(chk) > htx_free_data_space(htx))) {
applet_fl_set(appctx, APPCTX_FL_OUTBLK_FULL); applet_fl_set(appctx, APPCTX_FL_OUTBLK_FULL);
return 0; return 0;
} }
@ -242,7 +244,7 @@ int stats_putchk(struct appctx *appctx, struct buffer *buf, struct htx *htx)
chunk_reset(chk); chunk_reset(chk);
} }
else if (buf) { else if (buf) {
if (b_data(chk) > b_room(buf)) { if (STRESS_RUN1(b_data(buf), b_data(chk) > b_room(buf))) {
se_fl_set(appctx->sedesc, SE_FL_RCV_MORE | SE_FL_WANT_ROOM); se_fl_set(appctx->sedesc, SE_FL_RCV_MORE | SE_FL_WANT_ROOM);
return 0; return 0;
} }
@ -250,29 +252,31 @@ int stats_putchk(struct appctx *appctx, struct buffer *buf, struct htx *htx)
chunk_reset(chk); chunk_reset(chk);
} }
else { else {
if (applet_putchk(appctx, chk) == -1) if (STRESS_RUN1(applet_putchk_stress(appctx, chk) == -1,
applet_putchk(appctx, chk) == -1)) {
return 0; return 0;
}
} }
return 1; return 1;
} }
int stats_is_full(struct appctx *appctx, struct buffer *buf, struct htx *htx) int stats_is_full(struct appctx *appctx, struct buffer *buf, struct htx *htx)
{ {
if (htx) { if (htx) {
if (htx_almost_full(htx)) { if (STRESS_RUN1(!htx_is_empty(htx), htx_almost_full(htx))) {
applet_fl_set(appctx, APPCTX_FL_OUTBLK_FULL); applet_fl_set(appctx, APPCTX_FL_OUTBLK_FULL);
goto full; goto full;
} }
} }
else if (buf) { else if (buf) {
if (buffer_almost_full(buf)) { if (STRESS_RUN1(b_data(buf), buffer_almost_full(buf))) {
se_fl_set(appctx->sedesc, SE_FL_RCV_MORE | SE_FL_WANT_ROOM); se_fl_set(appctx->sedesc, SE_FL_RCV_MORE | SE_FL_WANT_ROOM);
goto full; goto full;
} }
} }
else { else {
if (buffer_almost_full(&appctx->outbuf)) { if (STRESS_RUN1(b_data(&appctx->outbuf),
buffer_almost_full(&appctx->outbuf))) {
applet_fl_set(appctx, APPCTX_FL_OUTBLK_FULL); applet_fl_set(appctx, APPCTX_FL_OUTBLK_FULL);
goto full; goto full;
} }