mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV 4427: query timeouts
Added MAX_STATEMENT_TIME user variable to automaticly kill queries after a given time limit has expired. - Added timer functions based on pthread_cond_timedwait - Added kill_handlerton() to signal storage engines about kill/timeout - Added support for GRANT ... MAX_STATEMENT_TIME=# - Copy max_statement_time to current user, if stored in mysql.user - Added status variable max_statement_time_exceeded - Added KILL_TIMEOUT - Removed digest hash from performance schema tests as they change all the time. - Updated test results that changed because of the new user variables or new fields in mysql.user This functionallity is inspired by work done by Davi Arnaut at twitter. Test case is copied from Davi's work. Documentation can be found at https://kb.askmonty.org/en/how-to-limittimeout-queries/ mysql-test/r/mysqld--help.result: Updated for new help message mysql-test/suite/perfschema/r/all_instances.result: Added new mutex mysql-test/suite/sys_vars/r/max_statement_time_basic.result: Added testing of max_statement_time mysql-test/suite/sys_vars/t/max_statement_time_basic.test: Added testing of max_statement_time mysql-test/t/max_statement_time.test: Added testing of max_statement_time mysys/CMakeLists.txt: Added thr_timer mysys/my_init.c: mysys/mysys_priv.h: Added new mutex and condition variables Added new mutex and condition variables mysys/thr_timer.c: Added timer functions based on pthread_cond_timedwait() This can be compiled with HAVE_TIMER_CREATE to benchmark agains timer_create()/timer_settime() sql/lex.h: Added MAX_STATEMENT_TIME sql/log_event.cc: Safety fix (timeout should be threated as an interrupted query) sql/mysqld.cc: Added support for timers Added status variable max_statement_time_exceeded sql/share/errmsg-utf8.txt: Added ER_QUERY_TIMEOUT sql/signal_handler.cc: Added support for KILL_TIMEOUT sql/sql_acl.cc: Added support for GRANT ... MAX_STATEMENT_TIME=# Copy max_statement_time to current user sql/sql_class.cc: Added timer functionality to THD. Added thd_kill_timeout() sql/sql_class.h: Added timer functionality to THD. Added KILL_TIMEOUT Added max_statement_time variable in similar manner as long_query_time was done. sql/sql_connect.cc: Added handling of max_statement_time_exceeded sql/sql_parse.cc: Added starting and stopping timers for queries. sql/sql_show.cc: Added max_statement_time_exceeded for user/connects status in MariaDB 10.0 sql/sql_yacc.yy: Added support for GRANT ... MAX_STATEMENT_TIME=# syntax, to be enabled in 10.0 sql/structs.h: Added max_statement_time user resource sql/sys_vars.cc: Added max_statement_time variables mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test Removed test as we require all fields in mysql.user table. scripts/mysql_system_tables.sql scripts/mysql_system_tables_data.sql scripts/mysql_system_tables_fix.sql Updated mysql.user with new max_statement_time field
This commit is contained in:
@ -211,8 +211,10 @@ static char *safe_str(char *str)
|
||||
static const char *safe_str(const char *str)
|
||||
{ return str ? str : ""; }
|
||||
|
||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||
static size_t safe_strlen(const char *str)
|
||||
{ return str ? strlen(str) : 0; }
|
||||
#endif
|
||||
|
||||
/* Classes */
|
||||
|
||||
@ -709,6 +711,8 @@ bool ROLE_GRANT_PAIR::init(MEM_ROOT *mem, char *username,
|
||||
|
||||
#define ROLE_ASSIGN_COLUMN_IDX 43
|
||||
#define DEFAULT_ROLE_COLUMN_IDX 44
|
||||
#define MAX_STATEMENT_TIME_COLUMN_IDX 45
|
||||
|
||||
/* various flags valid for ACL_USER */
|
||||
#define IS_ROLE (1L << 0)
|
||||
/* Flag to mark that a ROLE is on the recursive DEPTH_FIRST_SEARCH stack */
|
||||
@ -1272,6 +1276,8 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
|
||||
|
||||
user.sort= get_sort(2, user.host.hostname, user.user.str);
|
||||
user.hostname_length= safe_strlen(user.host.hostname);
|
||||
user.user_resource.user_conn= 0;
|
||||
user.user_resource.max_statement_time= 0.0;
|
||||
|
||||
/* Starting from 4.0.2 we have more fields */
|
||||
if (table->s->fields >= 31)
|
||||
@ -1331,6 +1337,14 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
|
||||
fix_user_plugin_ptr(&user);
|
||||
}
|
||||
}
|
||||
|
||||
if (table->s->fields > MAX_STATEMENT_TIME_COLUMN_IDX)
|
||||
{
|
||||
/* Starting from 10.1.1 we can have max_statement_time */
|
||||
ptr= get_field(thd->mem_root,
|
||||
table->field[MAX_STATEMENT_TIME_COLUMN_IDX]);
|
||||
user.user_resource.max_statement_time= ptr ? atof(ptr) : 0.0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -2041,6 +2055,8 @@ static void acl_update_user(const char *user, const char *host,
|
||||
acl_user->user_resource.conn_per_hour= mqh->conn_per_hour;
|
||||
if (mqh->specified_limits & USER_RESOURCES::USER_CONNECTIONS)
|
||||
acl_user->user_resource.user_conn= mqh->user_conn;
|
||||
if (mqh->specified_limits & USER_RESOURCES::MAX_STATEMENT_TIME)
|
||||
acl_user->user_resource.max_statement_time= mqh->max_statement_time;
|
||||
if (ssl_type != SSL_TYPE_NOT_SPECIFIED)
|
||||
{
|
||||
acl_user->ssl_type= ssl_type;
|
||||
@ -3393,8 +3409,6 @@ static int replace_user_table(THD *thd, TABLE *table, LEX_USER &combo,
|
||||
if (table->s->fields >= 36 &&
|
||||
(mqh.specified_limits & USER_RESOURCES::USER_CONNECTIONS))
|
||||
table->field[next_field+3]->store((longlong) mqh.user_conn, FALSE);
|
||||
mqh_used= mqh_used || mqh.questions || mqh.updates || mqh.conn_per_hour;
|
||||
|
||||
next_field+= 4;
|
||||
if (table->s->fields >= 41)
|
||||
{
|
||||
@ -3415,7 +3429,16 @@ static int replace_user_table(THD *thd, TABLE *table, LEX_USER &combo,
|
||||
table->field[next_field]->reset();
|
||||
table->field[next_field + 1]->reset();
|
||||
}
|
||||
|
||||
if (table->s->fields > MAX_STATEMENT_TIME_COLUMN_IDX)
|
||||
{
|
||||
if (mqh.specified_limits & USER_RESOURCES::MAX_STATEMENT_TIME)
|
||||
table->field[MAX_STATEMENT_TIME_COLUMN_IDX]->
|
||||
store(mqh.max_statement_time);
|
||||
}
|
||||
}
|
||||
mqh_used= (mqh_used || mqh.questions || mqh.updates || mqh.conn_per_hour ||
|
||||
mqh.user_conn || mqh.max_statement_time != 0.0);
|
||||
|
||||
/* table format checked earlier */
|
||||
if (handle_as_role)
|
||||
@ -7508,6 +7531,21 @@ static void add_user_option(String *grant, long value, const char *name,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void add_user_option(String *grant, double value, const char *name)
|
||||
{
|
||||
if (value != 0.0 )
|
||||
{
|
||||
char buff[FLOATING_POINT_BUFFER];
|
||||
size_t len;
|
||||
grant->append(' ');
|
||||
grant->append(name, strlen(name));
|
||||
grant->append(' ');
|
||||
len= my_fcvt(value, 6, buff, NULL);
|
||||
grant->append(buff, len);
|
||||
}
|
||||
}
|
||||
|
||||
static const char *command_array[]=
|
||||
{
|
||||
"SELECT", "INSERT", "UPDATE", "DELETE", "CREATE", "DROP", "RELOAD",
|
||||
@ -7890,7 +7928,8 @@ static bool show_global_privileges(THD *thd, ACL_USER_BASE *acl_entry,
|
||||
(acl_user->user_resource.questions ||
|
||||
acl_user->user_resource.updates ||
|
||||
acl_user->user_resource.conn_per_hour ||
|
||||
acl_user->user_resource.user_conn))
|
||||
acl_user->user_resource.user_conn ||
|
||||
acl_user->user_resource.max_statement_time != 0.0))
|
||||
{
|
||||
global.append(STRING_WITH_LEN(" WITH"));
|
||||
if (want_access & GRANT_ACL)
|
||||
@ -7903,6 +7942,8 @@ static bool show_global_privileges(THD *thd, ACL_USER_BASE *acl_entry,
|
||||
"MAX_CONNECTIONS_PER_HOUR", false);
|
||||
add_user_option(&global, acl_user->user_resource.user_conn,
|
||||
"MAX_USER_CONNECTIONS", true);
|
||||
add_user_option(&global, acl_user->user_resource.max_statement_time,
|
||||
"MAX_STATEMENT_TIME");
|
||||
}
|
||||
}
|
||||
|
||||
@ -12232,12 +12273,22 @@ bool acl_authenticate(THD *thd, uint com_change_user_pkt_len)
|
||||
if ((acl_user->user_resource.questions ||
|
||||
acl_user->user_resource.updates ||
|
||||
acl_user->user_resource.conn_per_hour ||
|
||||
acl_user->user_resource.user_conn || max_user_connections_checking) &&
|
||||
acl_user->user_resource.user_conn ||
|
||||
acl_user->user_resource.max_statement_time != 0.0 ||
|
||||
max_user_connections_checking) &&
|
||||
get_or_create_user_conn(thd,
|
||||
(opt_old_style_user_limits ? sctx->user : sctx->priv_user),
|
||||
(opt_old_style_user_limits ? sctx->host_or_ip : sctx->priv_host),
|
||||
&acl_user->user_resource))
|
||||
DBUG_RETURN(1); // The error is set by get_or_create_user_conn()
|
||||
|
||||
if (acl_user->user_resource.max_statement_time != 0.0)
|
||||
{
|
||||
thd->variables.max_statement_time_double=
|
||||
acl_user->user_resource.max_statement_time;
|
||||
thd->variables.max_statement_time=
|
||||
(thd->variables.max_statement_time_double * 1e6 + 0.1);
|
||||
}
|
||||
}
|
||||
else
|
||||
sctx->skip_grants();
|
||||
|
Reference in New Issue
Block a user