RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MINOR] added some comments to the places where we can send a pending connection to a server in case of throttling.

This commit is contained in:
willy tarreau 2006-04-07 17:37:55 +02:00
parent a647c7051e
commit cfbb218b42
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
haproxy.c
View File

@ -4297,6 +4297,7 @@ int process_srv(struct session *t) {
t->flags |= conn_err; t->flags |= conn_err;
if (!(t->flags & SN_FINST_MASK)) if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_C; t->flags |= SN_FINST_C;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
else { /* no error or write 0 */ else { /* no error or write 0 */
@ -4384,6 +4385,7 @@ int process_srv(struct session *t) {
Alert("Blocking cacheable cookie in response from instance %s, server %s.\n", t->proxy->id, t->srv->id); Alert("Blocking cacheable cookie in response from instance %s, server %s.\n", t->proxy->id, t->srv->id);
send_log(t->proxy, LOG_ALERT, "Blocking cacheable cookie in response from instance %s, server %s.\n", t->proxy->id, t->srv->id); send_log(t->proxy, LOG_ALERT, "Blocking cacheable cookie in response from instance %s, server %s.\n", t->proxy->id, t->srv->id);
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
} }
@ -4401,6 +4403,7 @@ int process_srv(struct session *t) {
t->flags |= SN_ERR_PRXCOND; t->flags |= SN_ERR_PRXCOND;
if (!(t->flags & SN_FINST_MASK)) if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_H; t->flags |= SN_FINST_H;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
@ -4833,6 +4836,7 @@ int process_srv(struct session *t) {
t->flags |= SN_ERR_SRVCL; t->flags |= SN_ERR_SRVCL;
if (!(t->flags & SN_FINST_MASK)) if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_H; t->flags |= SN_FINST_H;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
/* end of client write or end of server read. /* end of client write or end of server read.
@ -4861,8 +4865,8 @@ int process_srv(struct session *t) {
t->flags |= SN_ERR_SRVTO; t->flags |= SN_ERR_SRVTO;
if (!(t->flags & SN_FINST_MASK)) if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_H; t->flags |= SN_FINST_H;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
/* last client read and buffer empty */ /* last client read and buffer empty */
/* FIXME!!! here, we don't want to switch to SHUTW if the /* FIXME!!! here, we don't want to switch to SHUTW if the
@ -4954,6 +4958,7 @@ int process_srv(struct session *t) {
t->flags |= SN_ERR_SRVCL; t->flags |= SN_ERR_SRVCL;
if (!(t->flags & SN_FINST_MASK)) if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_D; t->flags |= SN_FINST_D;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
/* last read, or end of client write */ /* last read, or end of client write */
@ -5060,6 +5065,7 @@ int process_srv(struct session *t) {
t->flags |= SN_ERR_SRVCL; t->flags |= SN_ERR_SRVCL;
if (!(t->flags & SN_FINST_MASK)) if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_D; t->flags |= SN_FINST_D;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
else if ((c == CL_STSHUTR || c == CL_STCLOSE) && (req->l == 0)) { else if ((c == CL_STSHUTR || c == CL_STCLOSE) && (req->l == 0)) {
@ -5069,6 +5075,7 @@ int process_srv(struct session *t) {
t->srv->cur_sess--; t->srv->cur_sess--;
//close(t->srv_fd); //close(t->srv_fd);
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
else if (tv_cmp2_ms(&t->swexpire, &now) <= 0) { else if (tv_cmp2_ms(&t->swexpire, &now) <= 0) {
@ -5082,6 +5089,7 @@ int process_srv(struct session *t) {
t->flags |= SN_ERR_SRVTO; t->flags |= SN_ERR_SRVTO;
if (!(t->flags & SN_FINST_MASK)) if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_D; t->flags |= SN_FINST_D;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
else if (req->l == 0) { else if (req->l == 0) {
@ -5116,6 +5124,7 @@ int process_srv(struct session *t) {
t->flags |= SN_ERR_SRVCL; t->flags |= SN_ERR_SRVCL;
if (!(t->flags & SN_FINST_MASK)) if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_D; t->flags |= SN_FINST_D;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
else if (t->res_sr == RES_NULL || c == CL_STSHUTW || c == CL_STCLOSE) { else if (t->res_sr == RES_NULL || c == CL_STSHUTW || c == CL_STCLOSE) {
@ -5125,6 +5134,7 @@ int process_srv(struct session *t) {
t->srv->cur_sess--; t->srv->cur_sess--;
//close(t->srv_fd); //close(t->srv_fd);
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
else if (tv_cmp2_ms(&t->srexpire, &now) <= 0) { else if (tv_cmp2_ms(&t->srexpire, &now) <= 0) {
@ -5138,6 +5148,7 @@ int process_srv(struct session *t) {
t->flags |= SN_ERR_SRVTO; t->flags |= SN_ERR_SRVTO;
if (!(t->flags & SN_FINST_MASK)) if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_D; t->flags |= SN_FINST_D;
/* TODO : check if there are pending connections on this server */
return 1; return 1;
} }
else if (rep->l == BUFSIZE) { /* no room to read more data */ else if (rep->l == BUFSIZE) { /* no room to read more data */