mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-09 19:51:36 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: snapshot: restart on the event ID and not the stream ID

Browse Source 
The snapshots have the ability to restart a partial dump and they use
the stream ID as the restart point. Since it's purely HTTP, let's use
the event ID instead.
This commit is contained in:
Willy Tarreau 2018-09-07 11:51:51 +02:00
parent e9e878a056
commit 5865a8fe69
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types/applet.h
View File

@ -132,7 +132,7 @@ struct appctx {
int iid; /* if >= 0, ID of the proxy to filter on */
struct proxy *px; /* current proxy being dumped, NULL = not started yet. */
unsigned int flag; /* bit0: buffer being dumped, 0 = req, 1 = resp ; bit1=skip req ; bit2=skip resp. */
unsigned int sid; /* session ID of error being dumped */
unsigned int ev_id; /* event ID of error being dumped */
int ptr; /* <0: headers, >=0 : text pointer to restart from */
int bol; /* pointer to beginning of current line */
} errors;

4
src/proto_http.c
View File

@ -12784,10 +12784,10 @@ static int cli_io_handler_show_errors(struct appctx *appctx)
return 0;
}
appctx->ctx.errors.ptr = 0;
appctx->ctx.errors.sid = es->sid;
appctx->ctx.errors.ev_id = es->ev_id;
}
if (appctx->ctx.errors.sid != es->sid) {
if (appctx->ctx.errors.ev_id != es->ev_id) {
/* the snapshot changed while we were dumping it */
chunk_appendf(&trash,
" WARNING! update detected on this snapshot, dump interrupted. Please re-check!\n");