mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 09:07:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stats/cli: add plans to support more stick-table actions

Browse Source 
Right now we only support show/clear on a table. In order to introduce
the "set" keyword we need to get rid of the "show" boolean arg. There
is no functional change up to this commit.
This commit is contained in:
Willy Tarreau 2012-06-06 23:37:08 +02:00
parent c3a08a136b
commit dec9814e74
1 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/dumpstats.c
View File

@ -505,13 +505,14 @@ static int stats_dump_table_entry_to_buffer(struct chunk *msg, struct stream_int
return 1; return 1;
} }
static void stats_sock_table_key_request(struct stream_interface *si, char **args, bool show) static void stats_sock_table_key_request(struct stream_interface *si, char **args, int action)
{ {
struct session *s = si->conn.data_ctx; struct session *s = si->conn.data_ctx;
struct proxy *px = si->applet.ctx.table.target; struct proxy *px = si->applet.ctx.table.target;
struct stksess *ts; struct stksess *ts;
uint32_t uint32_key; uint32_t uint32_key;
unsigned char ip6_key[sizeof(struct in6_addr)]; unsigned char ip6_key[sizeof(struct in6_addr)];
struct chunk msg;
si->applet.st0 = STAT_CLI_OUTPUT; si->applet.st0 = STAT_CLI_OUTPUT;
@ -553,10 +554,17 @@ static void stats_sock_table_key_request(struct stream_interface *si, char **arg
static_table_key.key_len = strlen(args[4]); static_table_key.key_len = strlen(args[4]);
break; break;
default: default:
if (show) switch (action) {
si->applet.ctx.cli.msg = "Showing keys from tables of type other than ip, ipv6 and integer is not supported\n"; case STAT_CLI_O_TAB:
else si->applet.ctx.cli.msg = "Showing keys from tables of type other than ip, ipv6, string and integer is not supported\n";
si->applet.ctx.cli.msg = "Removing keys from ip tables of type other than ip, ipv6 and integer is not supported\n"; break;
case STAT_CLI_O_CLR:
si->applet.ctx.cli.msg = "Removing keys from ip tables of type other than ip, ipv6, string and integer is not supported\n";
break;
default:
si->applet.ctx.cli.msg = "Unknown action\n";
break;
}
si->applet.st0 = STAT_CLI_PRINT; si->applet.st0 = STAT_CLI_PRINT;
return; return;
} }
@ -569,26 +577,34 @@ static void stats_sock_table_key_request(struct stream_interface *si, char **arg
} }
ts = stktable_lookup_key(&px->table, &static_table_key); ts = stktable_lookup_key(&px->table, &static_table_key);
if (!ts)
return;
if (show) { switch (action) {
struct chunk msg; case STAT_CLI_O_TAB:
if (!ts)
return;
chunk_init(&msg, trash, trashlen); chunk_init(&msg, trash, trashlen);
if (!stats_dump_table_head_to_buffer(&msg, si, px, px)) if (!stats_dump_table_head_to_buffer(&msg, si, px, px))
return; return;
stats_dump_table_entry_to_buffer(&msg, si, px, ts); stats_dump_table_entry_to_buffer(&msg, si, px, ts);
return; return;
}
if (ts->ref_cnt) { case STAT_CLI_O_CLR:
/* don't delete an entry which is currently referenced */ if (!ts)
si->applet.ctx.cli.msg = "Entry currently in use, cannot remove\n"; return;
if (ts->ref_cnt) {
/* don't delete an entry which is currently referenced */
si->applet.ctx.cli.msg = "Entry currently in use, cannot remove\n";
si->applet.st0 = STAT_CLI_PRINT;
return;
}
stksess_kill(&px->table, ts);
break;
default:
si->applet.ctx.cli.msg = "Unknown action\n";
si->applet.st0 = STAT_CLI_PRINT; si->applet.st0 = STAT_CLI_PRINT;
return; break;
} }
stksess_kill(&px->table, ts);
} }
static void stats_sock_table_data_request(struct stream_interface *si, char **args) static void stats_sock_table_data_request(struct stream_interface *si, char **args)
@ -621,17 +637,14 @@ static void stats_sock_table_data_request(struct stream_interface *si, char **ar
} }
} }
static void stats_sock_table_request(struct stream_interface *si, char **args, bool show) static void stats_sock_table_request(struct stream_interface *si, char **args, int action)
{ {
si->applet.ctx.table.data_type = -1; si->applet.ctx.table.data_type = -1;
si->conn.data_st = STAT_ST_INIT; si->conn.data_st = STAT_ST_INIT;
si->applet.ctx.table.target = NULL; si->applet.ctx.table.target = NULL;
si->applet.ctx.table.proxy = NULL; si->applet.ctx.table.proxy = NULL;
si->applet.ctx.table.entry = NULL; si->applet.ctx.table.entry = NULL;
if (show) si->applet.st0 = action;
si->applet.st0 = STAT_CLI_O_TAB;
else
si->applet.st0 = STAT_CLI_O_CLR;
if (*args[2]) { if (*args[2]) {
si->applet.ctx.table.target = find_stktable(args[2]); si->applet.ctx.table.target = find_stktable(args[2]);
@ -642,13 +655,13 @@ static void stats_sock_table_request(struct stream_interface *si, char **args, b
} }
} }
else { else {
if (!show) if (action != STAT_CLI_O_TAB)
goto err_args; goto err_args;
return; return;
} }
if (strcmp(args[3], "key") == 0) if (strcmp(args[3], "key") == 0)
stats_sock_table_key_request(si, args, show); stats_sock_table_key_request(si, args, action);
else if (strncmp(args[3], "data.", 5) == 0) else if (strncmp(args[3], "data.", 5) == 0)
stats_sock_table_data_request(si, args); stats_sock_table_data_request(si, args);
else if (*args[3]) else if (*args[3])
@ -657,10 +670,17 @@ static void stats_sock_table_request(struct stream_interface *si, char **args, b
return; return;
err_args: err_args:
if (show) switch (action) {
case STAT_CLI_O_TAB:
si->applet.ctx.cli.msg = "Optional argument only supports \"data.<store_data_type>\" <operator> <value> and key <key>\n"; si->applet.ctx.cli.msg = "Optional argument only supports \"data.<store_data_type>\" <operator> <value> and key <key>\n";
else break;
case STAT_CLI_O_CLR:
si->applet.ctx.cli.msg = "Required arguments: <table> \"data.<store_data_type>\" <operator> <value> or <table> key <key>\n"; si->applet.ctx.cli.msg = "Required arguments: <table> \"data.<store_data_type>\" <operator> <value> or <table> key <key>\n";
break;
default:
si->applet.ctx.cli.msg = "Unknown action\n";
break;
}
si->applet.st0 = STAT_CLI_PRINT; si->applet.st0 = STAT_CLI_PRINT;
} }
@ -824,7 +844,7 @@ static int stats_sock_parse_request(struct stream_interface *si, char *line)
si->applet.st0 = STAT_CLI_O_ERR; // stats_dump_errors_to_buffer si->applet.st0 = STAT_CLI_O_ERR; // stats_dump_errors_to_buffer
} }
else if (strcmp(args[1], "table") == 0) { else if (strcmp(args[1], "table") == 0) {
stats_sock_table_request(si, args, true); stats_sock_table_request(si, args, STAT_CLI_O_TAB);
} }
else { /* neither "stat" nor "info" nor "sess" nor "errors" nor "table" */ else { /* neither "stat" nor "info" nor "sess" nor "errors" nor "table" */
return 0; return 0;
@ -889,7 +909,7 @@ static int stats_sock_parse_request(struct stream_interface *si, char *line)
return 1; return 1;
} }
else if (strcmp(args[1], "table") == 0) { else if (strcmp(args[1], "table") == 0) {
stats_sock_table_request(si, args, false); stats_sock_table_request(si, args, STAT_CLI_O_CLR);
/* end of processing */ /* end of processing */
return 1; return 1;
} }
@ -1477,11 +1497,8 @@ static void cli_io_handler(struct stream_interface *si)
si->applet.st0 = STAT_CLI_PROMPT; si->applet.st0 = STAT_CLI_PROMPT;
break; break;
case STAT_CLI_O_TAB: case STAT_CLI_O_TAB:
if (stats_table_request(si, true))
si->applet.st0 = STAT_CLI_PROMPT;
break;
case STAT_CLI_O_CLR: case STAT_CLI_O_CLR:
if (stats_table_request(si, false)) if (stats_table_request(si, si->applet.st0))
si->applet.st0 = STAT_CLI_PROMPT; si->applet.st0 = STAT_CLI_PROMPT;
break; break;
default: /* abnormal state */ default: /* abnormal state */