-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PS-9244 fix: binlog_server fails to resume copying binlog file after …
…server restart https://perconadev.atlassian.net/browse/PS-9244 Binlog Server Utility now properly handles 'STOP' events which may be written to the binlog when MySQL server shuts down. Added specializations of the 'binsrv::event::generic_body_impl<>' and 'binsrv::event::generic_post_header_impl<>' for 'code_type::stop' (both implemented via 'redirect_type' to 'empty_body' / 'empty_post_header'). 'STOP' is now a known event type for the 'binsrv::event::event' class and its inner body / post-header variants. Updated 'binsrv::reader_context'- it is now based on the following state machine: (ROTATE(artificial) FORMAT_DESCRIPTION <ANY>* (ROTATE|STOP))* 'process_binlog_event()' in the main application now calls 'close_binlog()' not only on real (non-artificial) 'ROTATE' events but on 'STOP' events as well. Introduced new 'binlog_streaming.pull_mode' MTR test case which checks if the Binlog Server Utility properly handles reconnects and resuming operation in background ('pull') mode. Common functionality from the 'binlog_streaming.binsrv' and 'binlog_streaming.pull_mode' extracted into the following include files: * 'identify_storage_backend.inc' - for identifying whether a local filesystem ('file') or a AWS S3 ('s3') storage backend should be used. * 'set_up_binsrv_environment.inc' - for creating storage directory, configuring log file and generating JSON configuration. * 'tear_down_binsrv_environment.inc' - for cleaning up data directory and removing log file along with JSON configuration file. Temporarily disabled running MTR under "Clang 17 ASan" in GitHub Workflows because of the "-stdlib=libc++ -fsanitize=address" alloc-dealloc-mismatch issue (llvm/llvm-project#59432). Hopefully, the problem will be fixed in clang-18.
- Loading branch information
1 parent
963d5c5
commit f810f31
Showing
19 changed files
with
531 additions
and
170 deletions.
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
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
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,23 @@ | ||
# The following environment variables must be defined to use AWS S3 as a | ||
# storage backend: | ||
# - $MTR_BINSRV_AWS_ACCESS_KEY_ID | ||
# - $MTR_BINSRV_AWS_SECRET_ACCESS_KEY | ||
# - $MTR_BINSRV_AWS_S3_BUCKET | ||
# - $MTR_BINSRV_AWS_S3_REGION (optional) | ||
|
||
--let $storage_backend = file | ||
if ($MTR_BINSRV_AWS_ACCESS_KEY_ID != '') | ||
{ | ||
if ($MTR_BINSRV_AWS_SECRET_ACCESS_KEY != '') | ||
{ | ||
if ($MTR_BINSRV_AWS_S3_BUCKET != '') | ||
{ | ||
--let $storage_backend = s3 | ||
--let $aws_cli = AWS_ACCESS_KEY_ID=$MTR_BINSRV_AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY=$MTR_BINSRV_AWS_SECRET_ACCESS_KEY aws | ||
if ($MTR_BINSRV_AWS_S3_REGION != '') | ||
{ | ||
--let $aws_cli = $aws_cli --region $MTR_BINSRV_AWS_S3_REGION | ||
} | ||
} | ||
} | ||
} |
94 changes: 94 additions & 0 deletions
94
mtr/binlog_streaming/include/set_up_binsrv_environment.inc
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,94 @@ | ||
# | ||
# Creates a data directory and a JSON configuration file for the Binlog Server Utility | ||
# | ||
# Usage: | ||
# --let $binsrv_connect_timeout = 20 | ||
# --let $binsrv_read_timeout = 60 | ||
# --let $binsrv_idle_time = 10 | ||
# --source set_up_binsrv_environment.inc | ||
|
||
--echo | ||
--echo *** Generating a configuration file in JSON format for the Binlog | ||
--echo *** Server utility. | ||
|
||
# temporarily disabling MySQL general query log so that AWS credentials | ||
# will not appear in plain in recorded SQL queries | ||
--disable_query_log | ||
SET @old_sql_log_off = @@sql_log_off; | ||
SET sql_log_off = ON; | ||
|
||
if ($storage_backend == file) | ||
{ | ||
--let $binsrv_storage_path = $MYSQL_TMP_DIR/storage | ||
eval SET @storage_uri = CONCAT('file://', '$binsrv_storage_path'); | ||
} | ||
if ($storage_backend == s3) | ||
{ | ||
--let $qualified_bucket = $MTR_BINSRV_AWS_S3_BUCKET | ||
if ($MTR_BINSRV_AWS_S3_REGION) | ||
{ | ||
--let $qualified_bucket = $qualified_bucket.$MTR_BINSRV_AWS_S3_REGION | ||
} | ||
--let $binsrv_storage_path = `SELECT CONCAT('/mtr-', UUID())` | ||
eval SET @storage_uri = CONCAT('s3://', '$MTR_BINSRV_AWS_ACCESS_KEY_ID', ':', '$MTR_BINSRV_AWS_SECRET_ACCESS_KEY', '@', '$qualified_bucket', '$binsrv_storage_path'); | ||
--let $aws_s3_bucket = $MTR_BINSRV_AWS_S3_BUCKET | ||
} | ||
|
||
--let $binsrv_log_path = $MYSQL_TMP_DIR/binsrv_utility.log | ||
eval SET @log_path = '$binsrv_log_path'; | ||
|
||
SET @delimiter_pos = INSTR(USER(), '@'); | ||
SET @connection_user = SUBSTRING(USER(), 1, @delimiter_pos - 1); | ||
SET @connection_host = SUBSTRING(USER(), @delimiter_pos + 1); | ||
SET @connection_host = IF(@connection_host = 'localhost', '127.0.0.1', @connection_host); | ||
|
||
eval SET @binsrv_config_json = JSON_OBJECT( | ||
'logger', JSON_OBJECT( | ||
'level', 'trace', | ||
'file', @log_path | ||
), | ||
'connection', JSON_OBJECT( | ||
'host', @connection_host, | ||
'port', @@global.port, | ||
'user', @connection_user, | ||
'password', '', | ||
'connect_timeout', $binsrv_connect_timeout, | ||
'read_timeout', $binsrv_read_timeout, | ||
'write_timeout', 60 | ||
), | ||
'replication', JSON_OBJECT( | ||
'server_id', @@server_id + 1, | ||
'idle_time', $binsrv_idle_time | ||
), | ||
'storage', JSON_OBJECT( | ||
'uri', @storage_uri | ||
) | ||
); | ||
|
||
--let $binsrv_config_file_path = $MYSQL_TMP_DIR/binsrv_config.json | ||
--let $write_var = `SELECT @binsrv_config_json` | ||
--let $write_to_file = $binsrv_config_file_path | ||
--source include/write_var_to_file.inc | ||
|
||
SET sql_log_off = @old_sql_log_off; | ||
--enable_query_log | ||
|
||
--echo | ||
--echo *** Determining binlog file directory from the server. | ||
--disable_query_log | ||
SET @path_separator = '/'; | ||
--source include/check_windows.inc | ||
if ($have_windows) { | ||
SET @path_separator = '\\'; | ||
} | ||
--let $binlog_base_dir = `SELECT LEFT(@@global.log_bin_basename, CHAR_LENGTH(@@global.log_bin_basename) - CHAR_LENGTH(SUBSTRING_INDEX(@@global.log_bin_basename, @path_separator, -1)))` | ||
--enable_query_log | ||
--echo | ||
--echo *** Creating a temporary directory <BINSRV_STORAGE_PATH> for storing | ||
--echo *** binlog files downloaded via the Binlog Server utility. | ||
if ($storage_backend == file) | ||
{ | ||
--mkdir $binsrv_storage_path | ||
} |
18 changes: 18 additions & 0 deletions
18
mtr/binlog_streaming/include/tear_down_binsrv_environment.inc
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,18 @@ | ||
--echo | ||
--echo *** Removing the Binlog Server utility storage directory. | ||
if ($storage_backend == file) | ||
{ | ||
--force-rmdir $binsrv_storage_path | ||
} | ||
if ($storage_backend == s3) | ||
{ | ||
--exec $aws_cli s3 rm s3://$aws_s3_bucket$binsrv_storage_path/ --recursive > /dev/null | ||
} | ||
|
||
--echo | ||
--echo *** Removing the Binlog Server utility log file. | ||
--remove_file $binsrv_log_path | ||
|
||
--echo | ||
--echo *** Removing the Binlog Server utility configuration file. | ||
--remove_file $binsrv_config_file_path |
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,55 @@ | ||
*** Resetting replication at the very beginning of the test. | ||
RESET MASTER; | ||
|
||
*** Generating a configuration file in JSON format for the Binlog | ||
*** Server utility. | ||
|
||
*** Determining binlog file directory from the server. | ||
|
||
*** Creating a temporary directory <BINSRV_STORAGE_PATH> for storing | ||
*** binlog files downloaded via the Binlog Server utility. | ||
|
||
*** Starting Binlog Server Utility in background in pull mode | ||
include/read_file_to_var.inc | ||
|
||
*** Determining the first fresh binary log name. | ||
|
||
*** Creating a simple table and filling it with some data. | ||
CREATE TABLE t1(id INT UNSIGNED NOT NULL AUTO_INCREMENT, PRIMARY KEY(id)) ENGINE=InnoDB; | ||
INSERT INTO t1 VALUES(DEFAULT); | ||
|
||
*** Restarting the server with a pause to test for the STOP event in | ||
*** the binary log and reconnection logic. | ||
# restart | ||
|
||
*** Determining the second binary log name. | ||
|
||
*** Filling the table with some more data and dropping the table. | ||
INSERT INTO t1 VALUES(DEFAULT); | ||
DROP TABLE t1; | ||
|
||
*** FLUSHING the binlog one more time to make sure that the second one | ||
*** is no longer open. | ||
FLUSH BINARY LOGS; | ||
|
||
*** Determining the third binary log name. | ||
|
||
*** Waiting till Binlog Server Utility starts processing the third | ||
*** binary log. | ||
|
||
*** Sending SIGTERM signal to the Binlog Server Utility and waiting for | ||
*** the process to terminate | ||
|
||
*** Checking that the Binlog Server utility detected an empty storage | ||
include/assert_grep.inc [Binlog storage must be initialized on an empty directory] | ||
|
||
*** Comparing server and downloaded versions of the first binlog file | ||
|
||
*** Comparing server and downloaded versions of the second binlog file | ||
|
||
*** Removing the Binlog Server utility storage directory. | ||
|
||
*** Removing the Binlog Server utility log file. | ||
|
||
*** Removing the Binlog Server utility configuration file. | ||
KILL CONNECTION <CONNECTION_ID>; |
Oops, something went wrong.