MDEV-7611 mysqldump --dump-slave always starts stopped slave #3780
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -184,7 +184,8 @@ static DYNAMIC_STRING dynamic_where; | |
| static MYSQL_RES *get_table_name_result= NULL; | ||
| static MEM_ROOT glob_root; | ||
| static MYSQL_RES *routine_res, *routine_list_res; | ||
| static size_t n_stopped_replicas= 0; | ||
| static char (*stopped_replicas)[NAME_CHAR_LEN]= NULL; | ||
|
|
||
| #include <sslopt-vars.h> | ||
| FILE *md_result_file= 0; | ||
|
|
@@ -1854,6 +1855,7 @@ static void free_resources() | |
| mysql_close(mysql); | ||
| mysql= 0; | ||
| } | ||
| my_free(stopped_replicas); | ||
| my_free(order_by); | ||
| my_free(opt_password); | ||
| my_free(current_host); | ||
|
|
@@ -6097,12 +6099,22 @@ static int do_stop_slave_sql(MYSQL *mysql_con) | |
| { | ||
| MYSQL_RES *slave; | ||
| MYSQL_ROW row; | ||
| // do_stop_slave_sql() should only be called once | ||
| DBUG_ASSERT(!stopped_replicas); | ||
|
|
||
| if (mysql_query_with_error_report(mysql_con, &slave, | ||
| multi_source ? | ||
| "SHOW ALL SLAVES STATUS" : | ||
| "SHOW SLAVE STATUS")) | ||
| return(1); | ||
| stopped_replicas= my_malloc(PSI_NOT_INSTRUMENTED, | ||
| slave->row_count*NAME_CHAR_LEN + 1, MYF(MY_WME)); | ||
| if (!stopped_replicas) | ||
| { | ||
| mysql_free_result(slave); | ||
| fputs("Error: Not enough memory to store current replica status\n", stderr); | ||
| return 1; | ||
| } | ||
|
|
||
| /* Loop over all slaves */ | ||
| while ((row= mysql_fetch_row(slave))) | ||
|
|
@@ -6123,6 +6135,8 @@ static int do_stop_slave_sql(MYSQL *mysql_con) | |
| mysql_free_result(slave); | ||
| return 1; | ||
| } | ||
| strmov(stopped_replicas[n_stopped_replicas++], | ||
| multi_source ? row[0] : ""); | ||
|
There was a problem hiding this comment. pedantically supporting no-multi-source on a best effort basis Lines 7010 to 7015 in 6aa47fa |
||
| } | ||
| } | ||
| } | ||
|
|
@@ -6250,43 +6264,29 @@ static int do_show_slave_status(MYSQL *mysql_con, int have_mariadb_gtid, | |
|
|
||
| static int do_start_slave_sql(MYSQL *mysql_con) | ||
| { | ||
| int error= 0; | ||
| DBUG_ENTER("do_start_slave_sql"); | ||
| for (; n_stopped_replicas--;) | ||
|
Comment on lines
6265
to
+6269
There was a problem hiding this comment. To use the new list instead of SHOW SLAVE STATUS, I essentially rewrote |
||
| { | ||
| /* | ||
| do_start_slave_sql() should only be called | ||
| sometime after do_stop_slave_sql() suceeds | ||
| */ | ||
| char* stopped_replica= stopped_replicas[n_stopped_replicas]; | ||
| char query[sizeof("START SLAVE ''") + NAME_CHAR_LEN]; | ||
| DBUG_PRINT("info", ("Connection: '%.*s'", NAME_CHAR_LEN, stopped_replica)); | ||
| // if SLAVE SQL is running, start it anyway to warn unexpected state change | ||
|
There was a problem hiding this comment. The program runs SHOW SLAVE STATUS multiple times thoughout the various step functions:
Perhaps the intent is in case replication configs change in the middle of |
||
| if (multi_source) | ||
| sprintf(query, "START SLAVE '%.*s'", NAME_CHAR_LEN, stopped_replica); | ||
|
|
||
| if (mysql_query_with_error_report(mysql_con, 0, | ||
| multi_source ? query : "START SLAVE")) | ||
| { | ||
| fprintf(stderr, "%s: Error: Unable to start slave '%.*s'\n", | ||
| my_progname_short, NAME_CHAR_LEN, stopped_replica); | ||
| error= 1; | ||
| } | ||
| } | ||
| DBUG_RETURN(error); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| connect replica,127.0.0.1,root,,,$SERVER_MYPORT_1; | ||
| connect active_primary,127.0.0.1,root,,,$SERVER_MYPORT_2; | ||
| connect inactive_primary,127.0.0.1,root,,,$SERVER_MYPORT_3; | ||
| connection replica; | ||
| CHANGE MASTER 'active_repl' TO master_port=MYPORT_2, master_host='127.0.0.1', master_user='root'; | ||
| START REPLICA 'active_repl'; | ||
| CHANGE MASTER 'inactive_repl' TO master_port=MYPORT_3, master_host='127.0.0.1', master_user='root'; | ||
| STOP REPLICA 'inactive_repl'; | ||
| Warnings: | ||
| Note 1255 Slave already has been stopped | ||
| # Basic | ||
| MYSQL_DUMP --compact --dump-slave --include-master-host-port test | ||
| /*M!999999\- enable the sandbox mode */ | ||
| CHANGE MASTER 'active_repl' TO MASTER_HOST='127.0.0.1', MASTER_PORT=MYPORT_2, MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; | ||
| CHANGE MASTER 'inactive_repl' TO MASTER_HOST='127.0.0.1', MASTER_PORT=MYPORT_3, MASTER_LOG_FILE='', MASTER_LOG_POS=BINLOG_START; | ||
|
|
||
| -- SET GLOBAL gtid_slave_pos=''; | ||
| # MDEV-7611 mysqldump --dump-slave always starts stopped slave | ||
| MYSQL_DUMP --compact --dump-slave test | ||
| /*M!999999\- enable the sandbox mode */ | ||
| CHANGE MASTER 'active_repl' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; | ||
| CHANGE MASTER 'inactive_repl' TO MASTER_LOG_FILE='', MASTER_LOG_POS=BINLOG_START; | ||
|
|
||
| -- SET GLOBAL gtid_slave_pos=''; | ||
| START REPLICA 'active_repl'; | ||
| Warnings: | ||
| Note 1254 Slave is already running | ||
| STOP REPLICA 'inactive_repl'; | ||
| Warnings: | ||
| Note 1255 Slave already has been stopped | ||
| # MDEV-5624 mysqldump --dump-slave option does not restart the replication if the dump has failed | ||
| MYSQL_DUMP --compact --dump-slave no_such_db | ||
| /*M!999999\- enable the sandbox mode */ | ||
| CHANGE MASTER 'active_repl' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; | ||
| CHANGE MASTER 'inactive_repl' TO MASTER_LOG_FILE='', MASTER_LOG_POS=BINLOG_START; | ||
|
|
||
| START REPLICA 'active_repl'; | ||
| Warnings: | ||
| Note 1254 Slave is already running | ||
| STOP REPLICA 'inactive_repl'; | ||
| Warnings: | ||
| Note 1255 Slave already has been stopped | ||
| # Cleanup | ||
| include/reset_master_slave.inc | ||
| disconnect replica; | ||
| disconnect active_primary; | ||
| disconnect inactive_primary; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| # Interactions with --dump-slave; based on `main.rpl_mysqldump_slave` | ||
|
There was a problem hiding this comment. and |
||
|
|
||
| --source include/have_log_bin.inc | ||
|
|
||
| --connect (replica,127.0.0.1,root,,,$SERVER_MYPORT_1) | ||
| --connect (active_primary,127.0.0.1,root,,,$SERVER_MYPORT_2) | ||
| --connect (inactive_primary,127.0.0.1,root,,,$SERVER_MYPORT_3) | ||
| --connection replica | ||
|
|
||
| --replace_result $SERVER_MYPORT_2 MYPORT_2 | ||
| --eval CHANGE MASTER 'active_repl' TO master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', master_user='root' | ||
| START REPLICA 'active_repl'; | ||
| --replace_result $SERVER_MYPORT_3 MYPORT_3 | ||
| --eval CHANGE MASTER 'inactive_repl' TO master_port=$SERVER_MYPORT_3, master_host='127.0.0.1', master_user='root' | ||
| STOP REPLICA 'inactive_repl'; | ||
|
|
||
| --echo # Basic | ||
| --echo MYSQL_DUMP --compact --dump-slave --include-master-host-port test | ||
| --replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/ | ||
| --replace_result $SERVER_MYPORT_2 MYPORT_2 $SERVER_MYPORT_3 MYPORT_3 | ||
| --exec $MYSQL_DUMP --compact --dump-slave --include-master-host-port test | ||
|
|
||
| --echo # MDEV-7611 mysqldump --dump-slave always starts stopped slave | ||
| --echo MYSQL_DUMP --compact --dump-slave test | ||
| --replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/ | ||
| --exec $MYSQL_DUMP --compact --dump-slave test | ||
| START REPLICA 'active_repl'; | ||
| STOP REPLICA 'inactive_repl'; | ||
|
|
||
| --echo # MDEV-5624 mysqldump --dump-slave option does not restart the replication if the dump has failed | ||
| --echo MYSQL_DUMP --compact --dump-slave no_such_db | ||
| --replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/ | ||
| --error 2 | ||
| --exec $MYSQL_DUMP --compact --dump-slave no_such_db | ||
| START REPLICA 'active_repl'; | ||
| STOP REPLICA 'inactive_repl'; | ||
|
|
||
| --echo # Cleanup | ||
| --source include/reset_master_slave.inc | ||
| --disconnect replica | ||
| --disconnect active_primary | ||
| --disconnect inactive_primary | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel that it’s wrong wasting memory on short names and already-stopped replicas, but I feel that it’s more wrong spending extra effort
reallocing unpredictably.I’d like to iterate the
MYSQL_RESan additional time before the following loop to sum up name sizes of (only) active replications.Question: How to rewind it from
mysql_fetch_row()s?Note I didn’t check size overflow here because of the Broken Windows Theory:
server/client/mysqldump.c
Line 1986 in 6aa47fa
server/client/mysqldump.c
Line 6620 in 6aa47fa