RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-28 15:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: session: make the number of stick counter entries more configurable

Browse Source 
In preparation of more flexibility in the stick counters, make their
number configurable. It still defaults to 3 which is the minimum
accepted value. Changing the value alone is not sufficient to get
more counters, some bitfields still need to be updated and the TCP
actions need to be updated as well, but this update tries to be
easier, which is nice for experimentation purposes.
This commit is contained in:
Willy Tarreau 2013-07-23 19:15:30 +02:00
parent 563eef4e30
commit b4c8493a9f
7 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/common/defaults.h
View File

@ -73,6 +73,13 @@
#define MAX_HDR_HISTORY 10
#endif
// max # of stick counters per session (at least 3 for sc0..sc2)
// Some changes are needed in TCP_ACT_TRK_SC* and SN_BE_TRACK_SC* if more
// values are required.
#ifndef MAX_SESS_STKCTR
#define MAX_SESS_STKCTR 3
#endif
// max # of loops we can perform around a read() which succeeds.
// It's very frequent that the system returns a few TCP segments at a time.
#ifndef MAX_READ_POLL_LOOPS

10
include/proto/session.h
View File

@ -59,7 +59,7 @@ static inline void session_store_counters(struct session *s)
void *ptr;
int i;
for (i = 0; i < sizeof(s->stkctr) / sizeof(s->stkctr[0]); i++) {
for (i = 0; i < MAX_SESS_STKCTR; i++) {
if (!s->stkctr[i].entry)
continue;
ptr = stktable_data_ptr(s->stkctr[i].table, s->stkctr[i].entry, STKTABLE_DT_CONN_CUR);
@ -83,7 +83,7 @@ static inline void session_stop_backend_counters(struct session *s)
if (likely(!(s->flags & SN_BE_TRACK_ANY)))
return;
for (i = 0; i < sizeof(s->stkctr) / sizeof(s->stkctr[0]); i++) {
for (i = 0; i < MAX_SESS_STKCTR; i++) {
if (!s->stkctr[i].entry)
continue;
@ -145,7 +145,7 @@ static void inline session_inc_http_req_ctr(struct session *s)
void *ptr;
int i;
for (i = 0; i < sizeof(s->stkctr) / sizeof(s->stkctr[0]); i++) {
for (i = 0; i < MAX_SESS_STKCTR; i++) {
if (!s->stkctr[i].entry)
continue;
@ -169,7 +169,7 @@ static void inline session_inc_be_http_req_ctr(struct session *s)
if (likely(!(s->flags & SN_BE_TRACK_ANY)))
return;
for (i = 0; i < sizeof(s->stkctr) / sizeof(s->stkctr[0]); i++) {
for (i = 0; i < MAX_SESS_STKCTR; i++) {
if (!s->stkctr[i].entry)
continue;
@ -198,7 +198,7 @@ static void inline session_inc_http_err_ctr(struct session *s)
void *ptr;
int i;
for (i = 0; i < sizeof(s->stkctr) / sizeof(s->stkctr[0]); i++) {
for (i = 0; i < MAX_SESS_STKCTR; i++) {
if (!s->stkctr[i].entry)
continue;

3
include/types/proto_tcp.h
View File

@ -33,9 +33,10 @@ enum {
TCP_ACT_ACCEPT = 1,
TCP_ACT_REJECT = 2,
TCP_ACT_EXPECT_PX = 3,
TCP_ACT_TRK_SC0 = 4, /* TCP request tracking : must be contiguous */
TCP_ACT_TRK_SC0 = 4, /* TCP request tracking : must be contiguous and cover up to MAX_SESS_STKCTR values */
TCP_ACT_TRK_SC1 = 5,
TCP_ACT_TRK_SC2 = 6,
TCP_ACT_TRK_SCMAX = TCP_ACT_TRK_SC0 + MAX_SESS_STKCTR - 1,
};
struct tcp_rule {

6
include/types/session.h
View File

@ -90,7 +90,9 @@
#define SN_COMP_READY 0x00100000 /* the compression is initialized */
/* session tracking flags: these ones must absolutely be contiguous. See also s->stkctr */
/* session tracking flags: these ones must absolutely be contiguous and cover
* at least MAX_SESS_STKCTR flags.
*/
#define SN_BE_TRACK_SC0 0x00200000 /* backend tracks stick-counter 0 */
#define SN_BE_TRACK_SC1 0x00400000 /* backend tracks stick-counter 1 */
#define SN_BE_TRACK_SC2 0x00800000 /* backend tracks stick-counter 2 */
@ -146,7 +148,7 @@ struct session {
} store[8]; /* tracked stickiness values to store */
int store_count;
struct stkctr stkctr[3]; /* stick counters */
struct stkctr stkctr[MAX_SESS_STKCTR]; /* stick counters */
struct stream_interface si[2]; /* client and server stream interfaces */
struct {

4
src/cfgparse.c
View File

@ -6367,7 +6367,7 @@ int check_config_validity()
list_for_each_entry(trule, &curproxy->tcp_req.l4_rules, list) {
struct proxy *target;
if (trule->action < TCP_ACT_TRK_SC0 || trule->action > TCP_ACT_TRK_SC2)
if (trule->action < TCP_ACT_TRK_SC0 || trule->action > TCP_ACT_TRK_SCMAX)
continue;
if (trule->act_prm.trk_ctr.table.n)
@ -6406,7 +6406,7 @@ int check_config_validity()
list_for_each_entry(trule, &curproxy->tcp_req.inspect_rules, list) {
struct proxy *target;
if (trule->action < TCP_ACT_TRK_SC0 || trule->action > TCP_ACT_TRK_SC2)
if (trule->action < TCP_ACT_TRK_SC0 || trule->action > TCP_ACT_TRK_SCMAX)
continue;
if (trule->act_prm.trk_ctr.table.n)

14
src/proto_tcp.c
View File

@ -938,7 +938,7 @@ int tcp_inspect_request(struct session *s, struct channel *req, int an_bit)
s->flags |= SN_FINST_R;
return 0;
}
else if ((rule->action >= TCP_ACT_TRK_SC0 && rule->action <= TCP_ACT_TRK_SC2) &&
else if ((rule->action >= TCP_ACT_TRK_SC0 && rule->action <= TCP_ACT_TRK_SCMAX) &&
!s->stkctr[tcp_trk_idx(rule->action)].entry) {
/* Note: only the first valid tracking parameter of each
* applies.
@ -1092,7 +1092,7 @@ int tcp_exec_req_rules(struct session *s)
result = 0;
break;
}
else if ((rule->action >= TCP_ACT_TRK_SC0 && rule->action <= TCP_ACT_TRK_SC2) &&
else if ((rule->action >= TCP_ACT_TRK_SC0 && rule->action <= TCP_ACT_TRK_SCMAX) &&
!s->stkctr[tcp_trk_idx(rule->action)].entry) {
/* Note: only the first valid tracking parameter of each
* applies.
@ -1184,7 +1184,9 @@ static int tcp_parse_request_rule(char **args, int arg, int section_type,
arg++;
rule->action = TCP_ACT_REJECT;
}
else if (strcmp(args[arg], "track-sc0") == 0 || strcmp(args[arg], "track-sc1") == 0 || strcmp(args[arg], "track-sc2") == 0) {
else if (strncmp(args[arg], "track-sc", 8) == 0 &&
args[arg][9] == '\0' && args[arg][8] >= '0' &&
args[arg][8] <= '0' + MAX_SESS_STKCTR) { /* track-sc 0..9 */
struct sample_expr *expr;
int kw = arg;
@ -1246,9 +1248,9 @@ static int tcp_parse_request_rule(char **args, int arg, int section_type,
}
else {
memprintf(err,
"'%s %s' expects 'accept', 'reject', 'track-sc0', 'track-sc1' "
" or 'track-sc2' in %s '%s' (got '%s')",
args[0], args[1], proxy_type_str(curpx), curpx->id, args[arg]);
"'%s %s' expects 'accept', 'reject', 'track-sc0' ... 'track-sc%d' "
" in %s '%s' (got '%s')",
args[0], args[1], MAX_SESS_STKCTR, proxy_type_str(curpx), curpx->id, args[arg]);
return -1;
}

6
src/session.c
View File

@ -420,7 +420,7 @@ int session_complete(struct session *s)
/* Let's count a session now */
proxy_inc_fe_sess_ctr(l, p);
for (i = 0; i < sizeof(s->stkctr) / sizeof(s->stkctr[0]); i++) {
for (i = 0; i < MAX_SESS_STKCTR; i++) {
void *ptr;
if (!s->stkctr[i].entry)
@ -707,7 +707,7 @@ void session_process_counters(struct session *s)
if (s->listener->counters)
s->listener->counters->bytes_in += bytes;
for (i = 0; i < sizeof(s->stkctr) / sizeof(s->stkctr[0]); i++) {
for (i = 0; i < MAX_SESS_STKCTR; i++) {
if (!s->stkctr[i].entry)
continue;
@ -741,7 +741,7 @@ void session_process_counters(struct session *s)
if (s->listener->counters)
s->listener->counters->bytes_out += bytes;
for (i = 0; i < sizeof(s->stkctr) / sizeof(s->stkctr[0]); i++) {
for (i = 0; i < MAX_SESS_STKCTR; i++) {
if (!s->stkctr[i].entry)
continue;