Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implemented fetch and pull modes for the main application #45

Merged
merged 1 commit into from
May 15, 2024
Merged

Implemented fetch and pull modes for the main application #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ set(source_files
src/binsrv/main_config.hpp
src/binsrv/main_config.cpp

src/binsrv/operation_mode_type_fwd.hpp
src/binsrv/operation_mode_type.hpp

src/binsrv/s3_error_helpers_private.hpp
src/binsrv/s3_error_helpers_private.cpp
src/binsrv/s3_error.hpp
Expand Down Expand Up @@ -241,11 +244,6 @@ set(source_files
src/easymysql/core_error.hpp
src/easymysql/core_error.cpp

src/easymysql/binlog_deimpl_private.hpp
src/easymysql/binlog_fwd.hpp
src/easymysql/binlog.hpp
src/easymysql/binlog.cpp

src/easymysql/connection_deimpl_private.hpp
src/easymysql/connection_fwd.hpp
src/easymysql/connection.hpp
Expand Down
5 changes: 4 additions & 1 deletion main_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"host": "127.0.0.1",
"port": 3306,
"user": "root",
"password": ""
"password": "",
"connect_timeout": 20,
"read_timeout": 60,
"write_timeout": 60
},
"storage": {
"uri": "file:///home/user/vault"
Expand Down
9 changes: 6 additions & 3 deletions mtr/binlog_streaming/t/binsrv.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,10 @@ eval SET @binsrv_config_json = JSON_OBJECT(
'host', @connection_host,
'port', @@global.port,
'user', @connection_user,
'password', ''
'password', '',
'connect_timeout', 20,
'read_timeout', 60,
'write_timeout', 60
),
'storage', JSON_OBJECT(
'uri', @storage_uri
Expand Down Expand Up @@ -144,7 +147,7 @@ if ($storage_backend == file)
--echo *** Executing the Binlog Server utility to download all binlog data
--echo *** from the server to the <BINSRV_STORAGE_PATH> directory (second
--echo *** binlog is still open / in use).
--exec $BINSRV $binsrv_config_file_path > /dev/null
--exec $BINSRV fetch $binsrv_config_file_path > /dev/null

--echo
--echo *** Checking that the Binlog Server utility detected an empty storage
Expand Down Expand Up @@ -220,7 +223,7 @@ FLUSH BINARY LOGS;
--echo *** Executing the Binlog Server utility one more time (the second
--echo *** binlog is no longer open / in use). Here we should also continue
--echo *** streaming binlog events from the last saved position.
--exec $BINSRV $binsrv_config_file_path > /dev/null
--exec $BINSRV fetch $binsrv_config_file_path > /dev/null

--echo
--echo *** Checking that the Binlog Server utility detected a previously
Expand Down
Loading