MEDIUM: conn-stream: Use endpoint error instead of conn-stream error
Instead of relying on the conn-stream error, via CS_FL_ERR flags, we now
directly use the error at the endpoint level with the flag CS_EP_ERROR. It
should be safe to do so. But we must be careful because it is still possible
that an error is processed too early. Anyway, a conn-stream has always a
valid endpoint, maybe detached from any endpoint, but valid.
diff --git a/dev/flags/flags.c b/dev/flags/flags.c
index c38d90e..ba4018d 100644
--- a/dev/flags/flags.c
+++ b/dev/flags/flags.c
@@ -219,7 +219,6 @@
printf("0\n");
return;
}
- SHOW_FLAG(f, CS_FL_ERR);
SHOW_FLAG(f, CS_FL_ADDR_FROM_SET);
SHOW_FLAG(f, CS_FL_ADDR_TO_SET);
SHOW_FLAG(f, CS_FL_ISBACK);
diff --git a/include/haproxy/conn_stream-t.h b/include/haproxy/conn_stream-t.h
index 8530586..55f338b 100644
--- a/include/haproxy/conn_stream-t.h
+++ b/include/haproxy/conn_stream-t.h
@@ -82,8 +82,6 @@
CS_FL_ADDR_FROM_SET = 0x00000002, /* source address is set */
CS_FL_ADDR_TO_SET = 0x00000004, /* destination address is set */
-
- CS_FL_ERR = 0x00000008, /* a non-recoverable error has occurred */
};
/* cs_shutr() modes */
diff --git a/src/backend.c b/src/backend.c
index 7250aa9..5429e35 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1744,8 +1744,8 @@
* sockets, socket pairs, andoccasionally TCP connections on the
* loopback on a heavily loaded system.
*/
- if ((srv_conn->flags & CO_FL_ERROR || s->csb->endp->flags & CS_EP_ERROR))
- s->csb->flags |= CS_FL_ERR;
+ if (srv_conn->flags & CO_FL_ERROR)
+ s->csb->endp->flags |= CS_EP_ERROR;
/* If we had early data, and the handshake ended, then
* we can remove the flag, and attempt to wake the task up,
@@ -1964,7 +1964,7 @@
* allocation problem, so we want to retry now.
*/
cs->si->state = SI_ST_CER;
- cs->flags &= ~CS_FL_ERR;
+ cs->endp->flags &= ~CS_EP_ERROR;
back_handle_st_cer(s);
DBG_TRACE_STATE("connection error, retry", STRM_EV_STRM_PROC|STRM_EV_SI_ST|STRM_EV_STRM_ERR, s);
@@ -2187,9 +2187,9 @@
done:
/* retryable error ? */
- if ((s->flags & SF_CONN_EXP) || (cs->flags & CS_FL_ERR)) {
+ if ((s->flags & SF_CONN_EXP) || (cs->endp->flags & CS_EP_ERROR)) {
if (!cs->si->err_type) {
- if (cs->flags & CS_FL_ERR)
+ if (cs->endp->flags & CS_EP_ERROR)
cs->si->err_type = SI_ET_CONN_ERR;
else
cs->si->err_type = SI_ET_CONN_TO;
@@ -2215,6 +2215,7 @@
void back_handle_st_cer(struct stream *s)
{
struct conn_stream *cs = s->csb;
+ int must_tar = (cs->endp->flags & CS_EP_ERROR);
DBG_TRACE_ENTER(STRM_EV_STRM_PROC|STRM_EV_SI_ST, s);
@@ -2234,7 +2235,7 @@
_HA_ATOMIC_DEC(&__objt_server(s->target)->cur_sess);
}
- if ((cs->flags & CS_FL_ERR) &&
+ if ((cs->endp->flags & CS_EP_ERROR) &&
conn && conn->err_code == CO_ER_SSL_MISMATCH_SNI) {
/* We tried to connect to a server which is configured
* with "verify required" and which doesn't have the
@@ -2291,7 +2292,7 @@
* layers in an unexpected state (i.e < ST_CONN).
*
* Note: the stream-interface will be switched to ST_REQ, ST_ASS or
- * ST_TAR and CS_FL_ERR and SF_CONN_EXP flags will be unset.
+ * ST_TAR and CS_EP_ERROR and SF_CONN_EXP flags will be unset.
*/
if (cs_reset_endp(cs) < 0) {
if (!cs->si->err_type)
@@ -2319,7 +2320,7 @@
stream_choose_redispatch(s);
- if (cs->flags & CS_FL_ERR) {
+ if (must_tar) {
/* The error was an asynchronous connection error, and we will
* likely have to retry connecting to the same server, most
* likely leading to the same result. To avoid this, we wait
@@ -2345,7 +2346,6 @@
cs->si->state = SI_ST_TAR;
s->conn_exp = tick_add(now_ms, MS_TO_TICKS(delay));
}
- cs->flags &= ~CS_FL_ERR;
DBG_TRACE_STATE("retry a new connection", STRM_EV_STRM_PROC|STRM_EV_SI_ST, s);
}
@@ -2401,7 +2401,7 @@
}
/* retryable error ? */
- if (cs->flags & CS_FL_ERR) {
+ if (cs->endp->flags & CS_EP_ERROR) {
if (!cs->si->err_type)
cs->si->err_type = SI_ET_CONN_ERR;
cs->si->state = SI_ST_CER;
diff --git a/src/cli.c b/src/cli.c
index 35d2d36..56629b0 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1084,7 +1084,7 @@
}
break;
default: /* abnormal state */
- cs->flags |= CS_FL_ERR;
+ cs->endp->flags |= CS_EP_ERROR;
break;
}
diff --git a/src/http_ana.c b/src/http_ana.c
index 927f0b9..31ba3cc 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -1249,7 +1249,6 @@
res->analysers &= AN_RES_FLT_END;
si->flags &= ~SI_FL_RXBLK_SHUT;
si->err_type = SI_ET_NONE;
- si->cs->flags &= ~CS_FL_ERR;
s->flags &= ~(SF_CONN_EXP | SF_ERR_MASK | SF_FINST_MASK);
s->conn_exp = TICK_ETERNITY;
stream_choose_redispatch(s);
diff --git a/src/stream.c b/src/stream.c
index e441b6e..fbf32eb 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -880,7 +880,7 @@
s->flags &= ~SF_CONN_EXP;
/* errors faced after sending data need to be reported */
- if (si->cs->flags & CS_FL_ERR && req->flags & CF_WROTE_DATA) {
+ if (s->csb->endp->flags & CS_EP_ERROR && req->flags & CF_WROTE_DATA) {
/* Don't add CF_WRITE_ERROR if we're here because
* early data were rejected by the server, or
* http_wait_for_response() will never be called
@@ -1673,7 +1673,7 @@
(CF_SHUTR|CF_READ_ACTIVITY|CF_READ_TIMEOUT|CF_SHUTW|
CF_WRITE_ACTIVITY|CF_WRITE_TIMEOUT|CF_ANA_TIMEOUT)) &&
!(s->flags & SF_CONN_EXP) &&
- !((si_f->cs->flags | si_b->cs->flags) & CS_FL_ERR) &&
+ !((s->csf->endp->flags | s->csb->flags) & CS_EP_ERROR) &&
((s->pending_events & TASK_WOKEN_ANY) == TASK_WOKEN_TIMER)) {
si_f->flags &= ~SI_FL_DONT_WAKE;
si_b->flags &= ~SI_FL_DONT_WAKE;
@@ -1692,10 +1692,10 @@
* must be be reviewed too.
*/
if (!stream_alloc_work_buffer(s)) {
- si_f->cs->flags |= CS_FL_ERR;
+ s->csf->endp->flags |= CS_EP_ERROR;
si_f->err_type = SI_ET_CONN_RES;
- si_b->cs->flags |= CS_FL_ERR;
+ s->csb->endp->flags |= CS_EP_ERROR;
si_b->err_type = SI_ET_CONN_RES;
if (!(s->flags & SF_ERR_MASK))
@@ -1711,7 +1711,7 @@
* connection setup code must be able to deal with any type of abort.
*/
srv = objt_server(s->target);
- if (unlikely(si_f->cs->flags & CS_FL_ERR)) {
+ if (unlikely(s->csf->endp->flags & CS_EP_ERROR)) {
if (si_state_in(si_f->state, SI_SB_EST|SI_SB_DIS)) {
si_shutr(si_f);
si_shutw(si_f);
@@ -1731,7 +1731,7 @@
}
}
- if (unlikely(si_b->cs->flags & CS_FL_ERR)) {
+ if (unlikely(s->csb->endp->flags & CS_EP_ERROR)) {
if (si_state_in(si_b->state, SI_SB_EST|SI_SB_DIS)) {
si_shutr(si_b);
si_shutw(si_b);
@@ -2255,8 +2255,8 @@
/* Benchmarks have shown that it's optimal to do a full resync now */
if (si_f->state == SI_ST_DIS ||
si_state_in(si_b->state, SI_SB_RDY|SI_SB_DIS) ||
- (si_f->cs->flags & CS_FL_ERR && si_f->state != SI_ST_CLO) ||
- (si_b->cs->flags & CS_FL_ERR && si_b->state != SI_ST_CLO))
+ (s->csf->endp->flags & CS_EP_ERROR && si_f->state != SI_ST_CLO) ||
+ (s->csb->endp->flags & CS_EP_ERROR && si_b->state != SI_ST_CLO))
goto resync_stream_interface;
/* otherwise we want to check if we need to resync the req buffer or not */
@@ -2379,8 +2379,8 @@
if (si_f->state == SI_ST_DIS ||
si_state_in(si_b->state, SI_SB_RDY|SI_SB_DIS) ||
- (si_f->cs->flags & CS_FL_ERR && si_f->state != SI_ST_CLO) ||
- (si_b->cs->flags & CS_FL_ERR && si_b->state != SI_ST_CLO))
+ (s->csf->endp->flags & CS_EP_ERROR && si_f->state != SI_ST_CLO) ||
+ (s->csb->endp->flags & CS_EP_ERROR && si_b->state != SI_ST_CLO))
goto resync_stream_interface;
if ((req->flags & ~rqf_last) & CF_MASK_ANALYSER)
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 395fcf8..f9c6839 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -225,7 +225,7 @@
* However, if SI_FL_NOLINGER is explicitly set, we know there is
* no risk so we close both sides immediately.
*/
- if (!(si->cs->flags & CS_FL_ERR) && !(si->flags & SI_FL_NOLINGER) &&
+ if (!(si->cs->endp->flags & CS_EP_ERROR) && !(si->flags & SI_FL_NOLINGER) &&
!(ic->flags & (CF_SHUTR|CF_DONT_READ)))
return;
@@ -521,7 +521,7 @@
if (/* changes on the production side */
(ic->flags & (CF_READ_NULL|CF_READ_ERROR)) ||
!si_state_in(si->state, SI_SB_CON|SI_SB_RDY|SI_SB_EST) ||
- (si->cs->flags & CS_FL_ERR) ||
+ (si->cs->endp->flags & CS_EP_ERROR) ||
((ic->flags & CF_READ_PARTIAL) &&
((ic->flags & CF_EOI) || !ic->to_forward || sio->state != SI_ST_EST)) ||
@@ -590,11 +590,11 @@
/* First step, report to the conn-stream what was detected at the
* connection layer : errors and connection establishment.
- * Only add CS_FL_ERR if we're connected, or we're attempting to
+ * Only add CS_EP_ERROR if we're connected, or we're attempting to
* connect, we may get there because we got woken up, but only run
* after process_stream() noticed there were an error, and decided
* to retry to connect, the connection may still have CO_FL_ERROR,
- * and we don't want to add CS_FL_ERR back
+ * and we don't want to add CS_EP_ERROR back
*
* Note: This test is only required because si_cs_process is also the SI
* wake callback. Otherwise si_cs_recv()/si_cs_send() already take
@@ -602,8 +602,8 @@
*/
if (si->state >= SI_ST_CON) {
- if ((cs->endp->flags & CS_EP_ERROR) || si_is_conn_error(si))
- si->cs->flags |= CS_FL_ERR;
+ if (si_is_conn_error(si))
+ cs->endp->flags |= CS_EP_ERROR;
}
/* If we had early data, and the handshake ended, then
@@ -679,11 +679,11 @@
* but process_stream() ran before, detected there were an
* error and put the si back to SI_ST_TAR. There's still
* CO_FL_ERROR on the connection but we don't want to add
- * CS_FL_ERR back, so give up
+ * CS_EP_ERROR back, so give up
*/
if (si->state < SI_ST_CON)
return 0;
- si->cs->flags |= CS_FL_ERR;
+ cs->endp->flags |= CS_EP_ERROR;
return 1;
}
@@ -797,7 +797,7 @@
}
if (cs->endp->flags & (CS_EP_ERROR|CS_EP_ERR_PENDING)) {
- si->cs->flags |= CS_FL_ERR;
+ cs->endp->flags |= CS_EP_ERROR;
return 1;
}
@@ -1092,7 +1092,7 @@
if (si->flags & SI_FL_KILL_CONN)
cs->endp->flags |= CS_EP_KILL_CONN;
- if (si->cs->flags & CS_FL_ERR) {
+ if (cs->endp->flags & CS_EP_ERROR) {
/* quick close, the socket is already shut anyway */
}
else if (si->flags & SI_FL_NOLINGER) {
@@ -1182,7 +1182,7 @@
if (cs->endp->flags & (CS_EP_ERROR|CS_EP_ERR_PENDING) || si_is_conn_error(si)) {
/* Write error on the file descriptor */
if (si->state >= SI_ST_CON)
- si->cs->flags |= CS_FL_ERR;
+ cs->endp->flags |= CS_EP_ERROR;
goto out_wakeup;
}
@@ -1558,10 +1558,8 @@
ret = 1;
}
- if (cs->endp->flags & CS_EP_ERROR) {
- si->cs->flags |= CS_FL_ERR;
+ if (cs->endp->flags & CS_EP_ERROR)
ret = 1;
- }
else if (cs->endp->flags & CS_EP_EOS) {
/* we received a shutdown */
ic->flags |= CF_READ_NULL;
@@ -1646,7 +1644,7 @@
* broken pipe and it must be reported.
*/
if (!(si->flags & SI_FL_RX_WAIT_EP) && (ic->flags & CF_SHUTR))
- si->cs->flags |= CS_FL_ERR;
+ si->cs->endp->flags |= CS_EP_ERROR;
/* automatically mark the applet having data available if it reported
* begin blocked by the channel.
@@ -1742,7 +1740,7 @@
* However, if SI_FL_NOLINGER is explicitly set, we know there is
* no risk so we close both sides immediately.
*/
- if (!(si->cs->flags & CS_FL_ERR) && !(si->flags & SI_FL_NOLINGER) &&
+ if (!(si->cs->endp->flags & CS_EP_ERROR) && !(si->flags & SI_FL_NOLINGER) &&
!(ic->flags & (CF_SHUTR|CF_DONT_READ)))
return;