RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-16 22:58:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stconn: Add a flag to ack endpoint errors at SC level

Browse Source 
The flag SC_FL_ERROR is added to ack errors on the endpoint. When
SE_FL_ERROR flag is detected on the SE descriptor, the corresponding is set
on the SC. Idea is to avoid, as far as possible, to manipulated the SE
descriptor in upper layers and know when an error in the endpoint is handled
by the SC.

For now, this flag is only set and cleared but never tested.
This commit is contained in:
Christopher Faulet 2023-04-14 10:42:08 +02:00
parent 638fe6ab0f
commit a1d14a7c7f
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/stconn-t.h
View File

@ -142,7 +142,7 @@ enum sc_flags {
SC_FL_ISBACK = 0x00000001, /* Set for SC on back-side */
SC_FL_EOI = 0x00000002, /* End of input was reached. no more data will be received from the endpoint */
/* not used: 0x00000004 */
SC_FL_ERROR = 0x00000004, /* A fatal error was reported */
SC_FL_NOLINGER = 0x00000008, /* may close without lingering. One-shot. */
SC_FL_NOHALF = 0x00000010, /* no half close, close both sides at once */
@ -174,11 +174,11 @@ static forceinline char *sc_show_flags(char *buf, size_t len, const char *delim,
/* prologue */
_(0);
/* flags */
_(SC_FL_ISBACK, _(SC_FL_EOI, _(SC_FL_NOLINGER, _(SC_FL_NOHALF,
_(SC_FL_ISBACK, _(SC_FL_EOI, _(SC_FL_ERROR, _(SC_FL_NOLINGER, _(SC_FL_NOHALF,
_(SC_FL_DONT_WAKE, _(SC_FL_INDEP_STR, _(SC_FL_WONT_READ,
_(SC_FL_NEED_BUFF, _(SC_FL_NEED_ROOM,
_(SC_FL_RCV_ONCE, _(SC_FL_SND_ASAP, _(SC_FL_SND_NEVERWAIT, _(SC_FL_SND_EXP_MORE,
_(SC_FL_ABRT_WANTED, _(SC_FL_SHUT_WANTED, _(SC_FL_ABRT_DONE, _(SC_FL_SHUT_DONE)))))))))))))))));
_(SC_FL_ABRT_WANTED, _(SC_FL_SHUT_WANTED, _(SC_FL_ABRT_DONE, _(SC_FL_SHUT_DONE))))))))))))))))));
/* epilogue */
_(~0U);
return buf;

4
src/cli.c
View File

@ -2830,7 +2830,7 @@ int pcli_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
sockaddr_free(&s->scb->dst);
sc_set_state(s->scb, SC_ST_INI);
s->scb->flags &= ~(SC_FL_SHUT_DONE|SC_FL_SHUT_WANTED);
s->scb->flags &= ~(SC_FL_ERROR|SC_FL_SHUT_DONE|SC_FL_SHUT_WANTED);
s->scb->flags &= SC_FL_ISBACK | SC_FL_DONT_WAKE; /* we're in the context of process_stream */
s->req.flags &= ~(CF_AUTO_CONNECT|CF_STREAMER|CF_STREAMER_FAST|CF_WROTE_DATA);
@ -2855,7 +2855,7 @@ int pcli_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
s->store_count = 0;
s->uniq_id = global.req_count++;
s->scf->flags &= ~(SC_FL_ABRT_DONE|SC_FL_ABRT_WANTED);
s->scf->flags &= ~(SC_FL_ERROR|SC_FL_ABRT_DONE|SC_FL_ABRT_WANTED);
s->scf->flags &= ~SC_FL_SND_NEVERWAIT;
s->scf->flags |= SC_FL_RCV_ONCE; /* one read is usually enough */

2
src/http_ana.c
View File

@ -1144,7 +1144,7 @@ static __inline int do_l7_retry(struct stream *s, struct stconn *sc)
res->analyse_exp = TICK_ETERNITY;
res->total = 0;
s->scb->flags &= ~(SC_FL_SHUT_DONE|SC_FL_SHUT_WANTED);
s->scb->flags &= ~(SC_FL_ERROR|SC_FL_SHUT_DONE|SC_FL_SHUT_WANTED);
if (sc_reset_endp(s->scb) < 0) {
if (!(s->flags & SF_ERR_MASK))
s->flags |= SF_ERR_INTERNAL;

16
src/stconn.c
View File

@ -1482,8 +1482,10 @@ static int sc_conn_recv(struct stconn *sc)
ret = 1;
}
if (sc_ep_test(sc, SE_FL_ERROR))
if (sc_ep_test(sc, SE_FL_ERROR)) {
sc->flags |= SC_FL_ERROR;
ret = 1;
}
else if (!(sc->flags & (SC_FL_WONT_READ|SC_FL_NEED_BUFF|SC_FL_NEED_ROOM)) &&
!(sc->flags & SC_FL_ABRT_DONE)) {
/* Subscribe to receive events if we're blocking on I/O */
@ -1663,6 +1665,8 @@ static int sc_conn_send(struct stconn *sc)
if (sc_ep_test(sc, SE_FL_ERROR | SE_FL_ERR_PENDING)) {
oc->flags |= CF_WRITE_EVENT;
BUG_ON(sc_ep_test(sc, SE_FL_EOS|SE_FL_ERROR|SE_FL_ERR_PENDING) == (SE_FL_EOS|SE_FL_ERR_PENDING));
if (sc_ep_test(sc, SE_FL_ERROR))
sc_ep_set(sc, SC_FL_ERROR);
return 1;
}
@ -1734,8 +1738,10 @@ static int sc_conn_process(struct stconn *sc)
*/
if (sc->state >= SC_ST_CON) {
if (sc_is_conn_error(sc))
if (sc_is_conn_error(sc)) {
sc_ep_set(sc, SE_FL_ERROR);
sc->flags |= SC_FL_ERROR;
}
}
/* If we had early data, and the handshake ended, then
@ -1784,6 +1790,9 @@ static int sc_conn_process(struct stconn *sc)
ic->flags |= CF_READ_EVENT;
}
if (sc_ep_test(sc, SE_FL_ERROR))
sc->flags |= SC_FL_ERROR;
/* Second step : update the stream connector and channels, try to forward any
* pending data, then possibly wake the stream up based on the new
* stream connector status.
@ -1836,6 +1845,9 @@ static int sc_applet_process(struct stconn *sc)
ic->flags |= CF_READ_EVENT;
}
if (sc_ep_test(sc, SE_FL_ERROR))
sc->flags |= SC_FL_ERROR;
if (sc_ep_test(sc, SE_FL_EOS)) {
/* we received a shutdown */
sc_abort(sc);