mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-16 22:31:42 +01:00
Code Issues Projects Releases Wiki Activity

[MINOR] stick-table: use suffix "_cnt" for cumulated counts

Browse Source 
The "_cnt" suffix is already used by ACLs to count various data,
so it makes sense to use the same one in "conn_cnt" instead of
"conn_cum" to count cumulated connections.

This is not a problem because no version was emitted with those
keywords.

Thus we'll try to stick to the following rules :

  xxxx_cnt : cumulated event count for criterion xxxx
  xxxx_cur : current number of concurrent entries for criterion xxxx
  xxxx_rate: event rate for criterion xxxx
This commit is contained in:
Willy Tarreau 2010-06-18 20:16:39 +02:00
parent 4a0347add0
commit 8fb12c4b61
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/configuration.txt
View File

@ -5116,7 +5116,7 @@ stick-table type {ip | integer | string [len <length>] } size <size>
may be used by ACLs in order to control various criteria related
to the activity of the client matching the stick-table. For each
item specified here, the size of each entry will be inflated so
that the additional data can fit. At the moment, only "conn_cum"
that the additional data can fit. At the moment, only "conn_cnt"
is supported, which can be used to store and retrieve the total
number of connections matching the entry since it was created. A
"server_id" type is also supported but it's only for internal

4
include/types/stick_table.h
View File

@ -42,13 +42,13 @@ enum {
/* The types of extra data we can store in a stick table */
enum {
STKTABLE_DT_SERVER_ID, /* the server ID to use with this session if > 0 */
STKTABLE_DT_CONN_CUM, /* cumulated number of connections */
STKTABLE_DT_CONN_CNT, /* cumulated number of connections */
STKTABLE_DATA_TYPES /* Number of data types, must always be last */
};
/* stick_table extra data. This is mainly used for casting or size computation */
union stktable_data {
unsigned int conn_cum;
unsigned int conn_cnt;
int server_id;
};

2
src/stick_table.c
View File

@ -525,7 +525,7 @@ int stktable_compatible_pattern(struct pattern_expr *expr, unsigned long table_t
/* Extra data types processing */
struct stktable_data_type stktable_data_types[STKTABLE_DATA_TYPES] = {
[STKTABLE_DT_CONN_CUM] = { .name = "conn_cum", .data_length = stktable_data_size(conn_cum) },
[STKTABLE_DT_CONN_CNT] = { .name = "conn_cnt", .data_length = stktable_data_size(conn_cnt) },
[STKTABLE_DT_SERVER_ID] = { .name = "server_id", .data_length = stktable_data_size(server_id) },
};