- developers - lists.mariadb.org

Re: [Maria-developers] [MariaDB/server] MDEV-11064 - Restrict the speed of reading binlog from Master (#246)
by Kristian Nielsen 21 Oct '16

21 Oct '16

vinchen <notifications(a)github.com> writes: > cli_safe_read_reallen() and and my_net_read_packet_reallen() is a good > way to fix the ABI problem. I will fix it like this. > > And the minimum precision is second in slave_sleep(), and it also a > the mutex. I think it is too heavy in most case. (It will wait > millisecond seconds usually) > So I will use my_sleep when wait less than 1 second, otherwise use slave_sleep. > > Is it ok? Yes, it looks fine thanks! And thanks for the explanation, yes now I see that usually the sleep will be quite small, unless there is a huge event. So I agree with using my_sleep() in the common case. I'll merge it like this after checking that everything compiles and tests ok. Thanks! - Kristian.

1 0

Re: [Maria-developers] [MariaDB/server] Restrict the speed of reading binlog from Master (#246)
by Kristian Nielsen 19 Oct '16

19 Oct '16

GCSAdmin <notifications(a)github.com> writes: > In some case, the speed of reading binlog from master is high, especially when doing a new replica. > It would bring the high traffic in master. > So We introduce a new variable "read_binlog_speed_limit" to control the binlog reading rate for IO thread to solve the problem. > It can work when slave_compressed_protocol is on. > But it maybe doesn't work well when the binlog event is very big. > You can view, comment on, or merge this pull request online at: > > https://github.com/MariaDB/server/pull/246 > -- Patch Links -- > > https://github.com/MariaDB/server/pull/246.patch > https://github.com/MariaDB/server/pull/246.diff Overall this looks clean and simple. There is one problem. The patch adds a field real_network_read_len to the NET structure. This will break the client library ABI, because NET is a part of MYSQL. So this would cause client programs to crash if they are linked with a different version of the client library. So this needs to be changed (if I understand correctly). One option might be to introduce new functions like cli_safe_read_reallen() and my_net_read_packet_reallen(), which return in addition the actual amount of bytes read from the server. The old cli_safe_read() and my_net_read_packet() could then become simple wrapper functions around those. And cli_safe_read_reallen() can be used in read_event() in sql/slave.cc. A smaller issue is that in case of a large packet, a large my_sleep() may be invoked, which will cause STOP SLAVE to hang. I think this can be solved simply by calling slave_sleep() instead, it handles terminating the wait early if interrupted by STOP SLAVE. Detailed comments on the patch below. I rebased the series against latest 10.2 to get a clean diff (the pull request includes a couple merges against the main 10.2 tree, these changes are unrelated to the patch). The rebase is in https://github.com/knielsen/server/tree/GCSAdmin-10.2-binlog-speed-limit-2 > diff --git a/include/mysql.h.pp b/include/mysql.h.pp > index 857f5b9..1da038c 100644 > --- a/include/mysql.h.pp > +++ b/include/mysql.h.pp > @@ -35,6 +35,7 @@ typedef struct st_net { > my_bool thread_specific_malloc; > unsigned char compress; > my_bool unused3; > + unsigned long real_network_read_len; As explained above, I believe this would break the ABI (that's the purpose of mysql.h.pp, to catch such problems). > diff --git a/sql/slave.cc b/sql/slave.cc > index 20bf68e..52bb668 100644 > --- a/sql/slave.cc > +++ b/sql/slave.cc > @@ -3307,13 +3308,14 @@ static int request_dump(THD *thd, MYSQL* mysql, Master_info* mi, > try a reconnect. We do not want to print anything to > the error log in this case because this a anormal > event in an idle server. > + network_read_len get the real network read length in VIO, especially using compressed protocol > > RETURN VALUES > 'packet_error' Error > number Length of packet > */ > > -static ulong read_event(MYSQL* mysql, Master_info *mi, bool* suppress_warnings) > +static ulong read_event(MYSQL* mysql, Master_info *mi, bool* suppress_warnings, ulong* network_read_len) Generally, lines longer than 80 characters should be avoided (coding style). > @@ -4473,6 +4479,34 @@ Stopping slave I/O thread due to out-of-memory error from master"); > goto err; > } > > + /* Control the binlog read speed of master when read_binlog_speed_limit is non-zero > + */ > + ulonglong read_binlog_speed_limit_in_bytes = opt_read_binlog_speed_limit * 1024; > + if (read_binlog_speed_limit_in_bytes) > + { > + /* prevent the tokenamount become a large value, > + for example, the IO thread doesn't work for a long time > + */ > + if (tokenamount > read_binlog_speed_limit_in_bytes * 2) > + { > + lastchecktime = my_hrtime().val; > + tokenamount = read_binlog_speed_limit_in_bytes * 2; > + } > + > + do > + { > + ulonglong currenttime = my_hrtime().val; > + tokenamount += (currenttime - lastchecktime) * read_binlog_speed_limit_in_bytes / (1000*1000); > + lastchecktime = currenttime; > + if(tokenamount < network_read_len) > + { > + ulonglong micro_sleeptime = 1000*1000 * (network_read_len - tokenamount) / read_binlog_speed_limit_in_bytes ; > + my_sleep(micro_sleeptime > 1000 ? micro_sleeptime : 1000); // at least sleep 1000 micro second > + } > + }while(tokenamount < network_read_len); > + tokenamount -= network_read_len; > + } > + As explained above, probably better to use slave_sleep() here to allow STOP SLAVE to interrupt a long sleep. Would it make sense to do this wait after calling queue_event()? This way the SQL thread can start applying the event immediately, reducing slave lag. What do you think? Thanks, - Kristian.

1 0

[Maria-developers] Consolidated patch for mdev-8646 introduced a bug MDEV-11081
by Alexander Barkov 18 Oct '16

18 Oct '16

Hello Igor, This patch: commit 2cfc450bf78c2d951729d1a0e8f731c0d987b1d5 Author: Igor Babaev <igor(a)askmonty.org> Date: Tue Feb 9 12:35:59 2016 -0800 seems to have introduced this bug: MDEV-11081 Cursor fetches NULL for aggregate functions Can you please have a look? Thanks!

1 0

[Maria-developers] Article on git rebasing - follow up from Developer Meetup
by Vicențiu Ciorbaru 17 Oct '16

17 Oct '16

Hi everyone! During the Developer Meetup in Amsterdam, we've had quite some productive discussions. One of these was on how to make use of git rebase to clean up our history before pushing final changes. The presentation on it was a bit rushed and perhaps some did not get the full gist out of it. I've decided to write an article on this and go into more details. The content should be generally useful and should give a primer to anyone not familiar with how to use git rebase. You can find the article at: http://vicentiu.ciorbaru.io/keeping-development-history-clean-using-git-reb… Hope it is of use. Regards, Vicențiu

1 0

[Maria-developers] Problem with parallel replication in 10.2
by Michael Widenius 17 Oct '16

17 Oct '16

Hi! I was trying to run a test that fails in the upcoming bb-10.2-jan on the normal 10.2 tree, when I noticed this strange issue: - Test fails with timeout when running with --debug - When looking at the trace file, I notice that we get a duplicate key error for the table gtid_slave_post (MyISAM table). Is this something normal ? To repeat: Store the included test in suite/rpl and run it with: mysql-test-run --debug --record rpl_skr Issue 2: bb-10.2-jan tree is a working tree for a merge of MariaDB 10.2 and MySQL 5.7 When running rpl_skr in 10.2 it takes 2 seconds When running it in the bb-10.2-jan tree it takes either a long time or we get a timeout. This is probably because of the new lock code in lock0lock.cc and lock0wait.cc which doesn't break conflicting transaction but instead waits for a timeout Would appreciate any help with this! Note that rpl_skr is a test that was originally part of rpl_parallel.test, but I have made it separate to be able to more easily test for this issue. Before testing bb-10.2-jan, please apply this patch that fixes one critical issue in this tree related to group-commit: diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index b69468d..0e9caed 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -4976,16 +4953,15 @@ innobase_commit( thd_wakeup_subsequent_commits(thd, 0); /* Now do a write + flush of logs. */ - if (!read_only) { - trx_commit_complete_for_mysql(trx); - } + trx_commit_complete_for_mysql(trx); trx_deregister_from_2pc(trx); } else { /* We just mark the SQL statement ended and do not do a transaction commit */ + DBUG_PRINT("info", ("Just mark SQL statement")); /* If we had reserved the auto-inc lock for some table in this SQL statement we release it now */ Regards, Monty

3 9

Re: [Maria-developers] [MariaDB/server] MDEV-11039 - Add new scheduling algorithm for reducing tail latencies (#245)
by Kristian Nielsen 17 Oct '16

17 Oct '16

Jiamin Huang <notifications(a)github.com> writes: > @sensssz pushed 1 commit. > > 5dc7ad8 Reduce conflict during in-order replication. Cool, that looks nice and simple. Thanks! - Kristian.

1 0

Re: [Maria-developers] MDEV-7145
by Kristian Nielsen 17 Oct '16

17 Oct '16

Phil Sweeney <launchpad(a)sweeneymail.com> writes: > Re: https://jira.mariadb.org/browse/MDEV-7145 > Delayed replication (a feature shipped in MySQL 5.6) has been a MariaDB > feature request since 2014, and has been listed as 'major/red' priority in > Can anyone comment on whether this is still likely to make it into 10.2. I am planning to look into this. - Kristian.

3 4

Re: [Maria-developers] [MariaDB/server] MDEV-11064 - Restrict the speed of reading binlog from Master (#246)
by Kristian Nielsen 15 Oct '16

15 Oct '16

Sergey Vojtovich <notifications(a)github.com> writes: > Similar to other open source projects, the MariaDB Foundation needs to > have shared ownership of all code that is included in the MariaDB > distribution. The easiest way to achieve this is by submitting your > code under the BSD-new license. This is a deliberate lie. There is no such requirement. In fact, most of the code in MariaDB Server is contributed only under the GPLv2, including code from the MariaDB Corporation, Oracle, Galera, Tokutek, ... You already indicated that your code is contributed under the GPLv2 by publishing it on a public github branch here: https://github.com/GCSAdmin/MariaDB/tree/10.2-binlog-speed-limit Please consider keeping your contribution under the GPLv2. Like other open source projects, the MariaDB server needs the strong protection that the GPL gives. You are of course free to use whatever license you choose for your own work. But I cannot be seen as supporting this continued abuse from managers at the MariaDB Corporation, people that will not even stand forward publically. So If you choose to support the BSD/MCA, I regret that I will not be able to look into your pull request. Otherwise, I will be happy to look into it, probably sometimes during the coming week. Thanks, - Kristian.

1 0

Re: [Maria-developers] [Commits] d0064c6: MDEV-7635: Convert log_queries_not_using_indexes to ulong
by Daniel Black 14 Oct '16

14 Oct '16

So this is making log-queries-not-using-indexes to take on the same meaning as min_examined_row_limit for the case of no-index and both seam to apply? Is thd->get_examined_row_count() the right comparison value if the non-indexed table had much fewer rows examined? Note - https://mariadb.com/kb/en/mariadb/server-system-variables/#log_queries_not_… needs updating and needs to reference min_examined_row_limit as well. Are log_slow_admin_statements / log_slow_slave_statements going to be modified in the same way and min-examined-row-limit to be deprecated? Is giving log-queries-not-using-indexes a default value of 5000 (as suggested for min-examined-row limit) applicable here? On 14/10/16 10:09, Nirbhay Choubey wrote: > revision-id: d0064c6e94414cfd6bbfcf171b1efabababe1d2e (mariadb-10.2.1-55-gd0064c6) > parent(s): 0d70fd0f9b7b8480b6053ef2dfcb55d917de2bca > author: Nirbhay Choubey > committer: Nirbhay Choubey > timestamp: 2016-10-13 19:09:53 -0400 > message: > > MDEV-7635: Convert log_queries_not_using_indexes to ulong > > --- > mysql-test/r/mysqld--help.result | 7 ++++--- > mysql-test/r/show_check.result | 10 +++++----- > mysql-test/r/variables.result | 4 ++-- > .../r/log_queries_not_using_indexes_basic.result | 18 ++++++++++-------- > .../t/log_queries_not_using_indexes_basic.test | 14 +++++++------- > mysql-test/t/show_check.test | 4 ++-- > sql/mysqld.cc | 2 +- > sql/mysqld.h | 2 +- > sql/sql_parse.cc | 3 ++- > sql/sys_vars.cc | 9 +++++---- > 10 files changed, 39 insertions(+), 34 deletions(-) > > diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result > index cb1399d..2a570f8 100644 > --- a/mysql-test/r/mysqld--help.result > +++ b/mysql-test/r/mysqld--help.result > @@ -365,9 +365,10 @@ The following options may be given as the first argument: > --log-isam[=name] Log all MyISAM changes to file. > --log-output=name How logs should be written. Any combination of: NONE, > FILE, TABLE > - --log-queries-not-using-indexes > + --log-queries-not-using-indexes[=#] > Log queries that are executed without benefit of any > - index to the slow log if it is open > + index and that examined fewer rows than specified to the > + slow log if it is open > --log-short-format Don't log extra information to update and slow-query > logs. > --log-slave-updates Tells the slave to log the updates from the slave thread > @@ -1257,7 +1258,7 @@ log-bin-trust-function-creators FALSE > log-error > log-isam myisam.log > log-output FILE > -log-queries-not-using-indexes FALSE > +log-queries-not-using-indexes 0 > log-short-format FALSE > log-slave-updates FALSE > log-slow-admin-statements FALSE > diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result > index 19a2597..db1a0ee 100644 > --- a/mysql-test/r/show_check.result > +++ b/mysql-test/r/show_check.result > @@ -1228,27 +1228,27 @@ use test; > flush status; > show variables like "log_queries_not_using_indexes"; > Variable_name Value > -log_queries_not_using_indexes ON > +log_queries_not_using_indexes 1 > select 1 from information_schema.tables limit 1; > 1 > 1 > show status like 'slow_queries'; > Variable_name Value > Slow_queries 1 > -set global log_queries_not_using_indexes=OFF; > +set global log_queries_not_using_indexes=0; > show variables like "log_queries_not_using_indexes"; > Variable_name Value > -log_queries_not_using_indexes OFF > +log_queries_not_using_indexes 0 > select 1 from information_schema.tables limit 1; > 1 > 1 > show status like 'slow_queries'; > Variable_name Value > Slow_queries 1 > -set global log_queries_not_using_indexes=ON; > +set global log_queries_not_using_indexes=1; > show variables like "log_queries_not_using_indexes"; > Variable_name Value > -log_queries_not_using_indexes ON > +log_queries_not_using_indexes 1 > select 1 from information_schema.tables limit 1; > 1 > 1 > diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result > index 50379a5..1423284 100644 > --- a/mysql-test/r/variables.result > +++ b/mysql-test/r/variables.result > @@ -995,10 +995,10 @@ select @@log_queries_not_using_indexes; > 0 > show variables like 'log_queries_not_using_indexes'; > Variable_name Value > -log_queries_not_using_indexes OFF > +log_queries_not_using_indexes 0 > select * from information_schema.session_variables where variable_name like 'log_queries_not_using_indexes'; > VARIABLE_NAME VARIABLE_VALUE > -LOG_QUERIES_NOT_USING_INDEXES OFF > +LOG_QUERIES_NOT_USING_INDEXES 0 > select @@""; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '""' at line 1 > select @@&; > diff --git a/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result > index fcb5abb..9dafcb7 100644 > --- a/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result > +++ b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result > @@ -29,10 +29,12 @@ SELECT @@global.log_queries_not_using_indexes; > @@global.log_queries_not_using_indexes > 0 > SET GLOBAL log_queries_not_using_indexes= ON; > +ERROR 42000: Incorrect argument type to variable 'log_queries_not_using_indexes' > SELECT @@global.log_queries_not_using_indexes; > @@global.log_queries_not_using_indexes > -1 > +0 > SET GLOBAL log_queries_not_using_indexes= OFF; > +ERROR 42000: Incorrect argument type to variable 'log_queries_not_using_indexes' > SELECT @@global.log_queries_not_using_indexes; > @@global.log_queries_not_using_indexes > 0 > @@ -47,20 +49,20 @@ SELECT @@global.log_queries_not_using_indexes; > @@global.log_queries_not_using_indexes > 0 > SET @@global.log_queries_not_using_indexes= 'DEFAULT'; > -ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'DEFAULT' > +ERROR 42000: Incorrect argument type to variable 'log_queries_not_using_indexes' > SET @@global.log_queries_not_using_indexes= 'true'; > -ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'true' > +ERROR 42000: Incorrect argument type to variable 'log_queries_not_using_indexes' > SET @@global.log_queries_not_using_indexes= BLABLA; > -ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'BLABLA' > +ERROR 42000: Incorrect argument type to variable 'log_queries_not_using_indexes' > SET @@global.log_queries_not_using_indexes= 25; > -ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of '25' > SET GLOBAL log_queries_not_using_indexes= -1; > -ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of '-1' > +Warnings: > +Warning 1292 Truncated incorrect log_queries_not_using_indexes value: '-1' > SET @badvar= 'true'; > SET @@global.log_queries_not_using_indexes= @badvar; > -ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'true' > +ERROR 42000: Incorrect argument type to variable 'log_queries_not_using_indexes' > SET GLOBAL log_queries_not_using_indexes= 'DEFAULT'; > -ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'DEFAULT' > +ERROR 42000: Incorrect argument type to variable 'log_queries_not_using_indexes' > SET log_queries_not_using_indexes= TRUE; > ERROR HY000: Variable 'log_queries_not_using_indexes' is a GLOBAL variable and should be set with SET GLOBAL > SET SESSION log_queries_not_using_indexes= TRUE; > diff --git a/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test b/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test > index a726bff..806030d 100644 > --- a/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test > +++ b/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test > @@ -47,9 +47,11 @@ SELECT @@global.log_queries_not_using_indexes; > SET GLOBAL log_queries_not_using_indexes= DEFAULT; > SELECT @@global.log_queries_not_using_indexes; > > +--error ER_WRONG_TYPE_FOR_VAR > SET GLOBAL log_queries_not_using_indexes= ON; > SELECT @@global.log_queries_not_using_indexes; > > +--error ER_WRONG_TYPE_FOR_VAR > SET GLOBAL log_queries_not_using_indexes= OFF; > SELECT @@global.log_queries_not_using_indexes; > > @@ -66,26 +68,24 @@ SELECT @@global.log_queries_not_using_indexes; > # Check if the value in GLOBAL Table matches value in variable # > ################################################################# > > ---error ER_WRONG_VALUE_FOR_VAR > +--error ER_WRONG_TYPE_FOR_VAR > SET @@global.log_queries_not_using_indexes= 'DEFAULT'; > > ---error ER_WRONG_VALUE_FOR_VAR > +--error ER_WRONG_TYPE_FOR_VAR > SET @@global.log_queries_not_using_indexes= 'true'; > > ---error ER_WRONG_VALUE_FOR_VAR > +--error ER_WRONG_TYPE_FOR_VAR > SET @@global.log_queries_not_using_indexes= BLABLA; > > ---error ER_WRONG_VALUE_FOR_VAR > SET @@global.log_queries_not_using_indexes= 25; > > ---error ER_WRONG_VALUE_FOR_VAR > SET GLOBAL log_queries_not_using_indexes= -1; > > SET @badvar= 'true'; > ---error ER_WRONG_VALUE_FOR_VAR > +--error ER_WRONG_TYPE_FOR_VAR > SET @@global.log_queries_not_using_indexes= @badvar; > > ---error ER_WRONG_VALUE_FOR_VAR > +--error ER_WRONG_TYPE_FOR_VAR > SET GLOBAL log_queries_not_using_indexes= 'DEFAULT'; > > --error ER_GLOBAL_VARIABLE > diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test > index a14c42d..9644b77 100644 > --- a/mysql-test/t/show_check.test > +++ b/mysql-test/t/show_check.test > @@ -945,11 +945,11 @@ flush status; > show variables like "log_queries_not_using_indexes"; > select 1 from information_schema.tables limit 1; > show status like 'slow_queries'; > -set global log_queries_not_using_indexes=OFF; > +set global log_queries_not_using_indexes=0; > show variables like "log_queries_not_using_indexes"; > select 1 from information_schema.tables limit 1; > show status like 'slow_queries'; > -set global log_queries_not_using_indexes=ON; > +set global log_queries_not_using_indexes=1; > show variables like "log_queries_not_using_indexes"; > select 1 from information_schema.tables limit 1; > show status like 'slow_queries'; > diff --git a/sql/mysqld.cc b/sql/mysqld.cc > index 28e91e2..f02f2b0 100644 > --- a/sql/mysqld.cc > +++ b/sql/mysqld.cc > @@ -395,7 +395,7 @@ my_bool disable_log_notes; > static my_bool opt_abort; > ulonglong log_output_options; > my_bool opt_userstat_running; > -my_bool opt_log_queries_not_using_indexes= 0; > +ulong opt_log_queries_not_using_indexes= 0; > bool opt_error_log= IF_WIN(1,0); > bool opt_disable_networking=0, opt_skip_show_db=0; > bool opt_skip_name_resolve=0; > diff --git a/sql/mysqld.h b/sql/mysqld.h > index 846a01a..d577a9b 100644 > --- a/sql/mysqld.h > +++ b/sql/mysqld.h > @@ -114,7 +114,7 @@ extern my_bool opt_backup_history_log; > extern my_bool opt_backup_progress_log; > extern ulonglong log_output_options; > extern ulong log_backup_output_options; > -extern my_bool opt_log_queries_not_using_indexes; > +extern ulong opt_log_queries_not_using_indexes; > extern bool opt_disable_networking, opt_skip_show_db; > extern bool opt_skip_name_resolve; > extern bool opt_ignore_builtin_innodb; > diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc > index c76e22a..de2da9e 100644 > --- a/sql/sql_parse.cc > +++ b/sql/sql_parse.cc > @@ -2417,7 +2417,8 @@ void log_slow_statement(THD *thd) > if (((thd->server_status & SERVER_QUERY_WAS_SLOW) || > ((thd->server_status & > (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) && > - opt_log_queries_not_using_indexes && > + (opt_log_queries_not_using_indexes > 0) && > + (thd->get_examined_row_count() >= opt_log_queries_not_using_indexes) && > !(sql_command_flags[thd->lex->sql_command] & CF_STATUS_COMMAND))) && > thd->get_examined_row_count() >= thd->variables.min_examined_row_limit) > { > diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc > index 47a0a38..d11d690 100644 > --- a/sql/sys_vars.cc > +++ b/sql/sys_vars.cc > @@ -1178,12 +1178,13 @@ static Sys_var_charptr Sys_log_error( > CMD_LINE(OPT_ARG, OPT_LOG_ERROR), > IN_FS_CHARSET, DEFAULT(disabled_my_option)); > > -static Sys_var_mybool Sys_log_queries_not_using_indexes( > +static Sys_var_ulong Sys_log_queries_not_using_indexes( > "log_queries_not_using_indexes", > - "Log queries that are executed without benefit of any index to the " > - "slow log if it is open", > + "Log queries that are executed without benefit of any index and that " > + "examined fewer rows than specified to the slow log if it is open", > GLOBAL_VAR(opt_log_queries_not_using_indexes), > - CMD_LINE(OPT_ARG), DEFAULT(FALSE)); > + CMD_LINE(OPT_ARG), VALID_RANGE(0, UINT_MAX), DEFAULT(0), > + BLOCK_SIZE(1)); > > static Sys_var_mybool Sys_log_slow_admin_statements( > "log_slow_admin_statements", > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits >

1 0

Re: [Maria-developers] [Commits] a3d469b: MDEV-11035: Restore removed disallow-writes for Galera
by Nirbhay Choubey 13 Oct '16

13 Oct '16

Hi Jan! On Wed, Oct 12, 2016 at 7:31 AM, Jan Lindström <jan.lindstrom(a)mariadb.com> wrote: > revision-id: a3d469b991732dddfafe966011e996166cd98671 > (mariadb-10.2.2-39-ga3d469b) > parent(s): 6e46de4a674c55858ec5b2528dcebb69010b34d6 > author: Jan Lindström > committer: Jan Lindström > timestamp: 2016-10-12 14:29:36 +0300 > message: > > MDEV-11035: Restore removed disallow-writes for Galera > > Found actually only one missing condition. > The patch is unfortunately incomplete. There are a bunch of WAIT_ALLOW_WRITES' (when compared to 10.1) that are currently missing in 10.2. Also, there is a memory leak as InnoDB does not free this event on shutdown (srv_free()). You can use galera.galera_var_innodb_disallow_writes to verify the fix. Best, Nirbhay > --- > storage/innobase/handler/ha_innodb.cc | 6 ++++-- > storage/innobase/srv/srv0srv.cc | 4 +--- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/storage/innobase/handler/ha_innodb.cc > b/storage/innobase/handler/ha_innodb.cc > index 1e74154..dc7e6eb 100644 > --- a/storage/innobase/handler/ha_innodb.cc > +++ b/storage/innobase/handler/ha_innodb.cc > @@ -23276,10 +23276,11 @@ innobase_disallow_writes_update( > { > *(my_bool*)var_ptr = *(my_bool*)save; > ut_a(srv_allow_writes_event); > - if (*(my_bool*)var_ptr) > + if (*(my_bool*)var_ptr) { > os_event_reset(srv_allow_writes_event); > - else > + } else { > os_event_set(srv_allow_writes_event); > + } > } > > static MYSQL_SYSVAR_BOOL(disallow_writes, innobase_disallow_writes, > @@ -23287,6 +23288,7 @@ static MYSQL_SYSVAR_BOOL(disallow_writes, > innobase_disallow_writes, > "Tell InnoDB to stop any writes to disk", > NULL, innobase_disallow_writes_update, FALSE); > #endif /* WITH_INNODB_DISALLOW_WRITES */ > + > static MYSQL_SYSVAR_BOOL(random_read_ahead, srv_random_read_ahead, > PLUGIN_VAR_NOCMDARG, > "Whether to use read ahead for random access within an extent.", > diff --git a/storage/innobase/srv/srv0srv.cc > b/storage/innobase/srv/srv0srv.cc > index 49de954..a46f62f 100644 > --- a/storage/innobase/srv/srv0srv.cc > +++ b/storage/innobase/srv/srv0srv.cc > @@ -1969,9 +1969,7 @@ DECLARE_THREAD(srv_error_monitor_thread)( > if (sync_array_print_long_waits(&waiter, &sema) > && sema == old_sema && os_thread_eq(waiter, old_waiter)) { > #if defined(WITH_WSREP) && defined(WITH_INNODB_DISALLOW_WRITES) > - if (true) { > - // JAN: TODO: MySQL 5.7 > - //if (srv_allow_writes_event->is_set) { > + if (os_event_is_set(srv_allow_writes_event)) { > #endif /* WITH_WSREP */ > fatal_cnt++; > #if defined(WITH_WSREP) && defined(WITH_INNODB_DISALLOW_WRITES) > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

1 0