database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Improve mtr replication setup

Browse Source 
- Log slave state if sync_with_master_gtid fails, like we do
  in sync_with_master.inc
- Increase master-retry-count to 30 for slow builders
This commit is contained in:
Monty
2025-03-25 17:02:19 +02:00
parent bb5ae63aef
commit 23eb9d6821
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/sync_with_master_gtid.inc
View File

@@ -42,6 +42,7 @@ if ($_result == -1)
{
--let $_current_gtid_pos= `SELECT @@GLOBAL.gtid_slave_pos`
--echo Timeout in master_gtid_wait('$master_pos', $_slave_timeout), current slave GTID position is: $_current_gtid_pos.
--source include/show_rpl_debug_info.inc
--die Failed to sync with master
}

2
mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result
View File

@@ -20,7 +20,7 @@ include/assert.inc [Value returned by SSS and PS table for SSL_Verify_Server_Cer
include/assert.inc [Value returned by SSS and PS table for SSL_Crl_File should be same.]
include/assert.inc [Value returned by SSS and PS table for SSL_Crl_Path should be same.]
include/assert.inc [Value returned by SSS and PS table for Connection_Retry_Interval should be same.]
include/assert.inc [Value returned by PS table for Connection_Retry_Count should be 10.]
include/assert.inc [Value returned by PS table for Connection_Retry_Count should be 30.]
# Heartbeat_Interval is part of I_S and P_S. We will compare the
# two to make sure both match.

2
mysql-test/suite/rpl/rpl_1slave_base.cnf
View File

@@ -23,7 +23,7 @@ log-basename= slave
init-rpl-role= slave
log-slave-updates
master-retry-count= 10
master-retry-count= 30
# Values reported by slave when it connect to master
# and shows up in SHOW SLAVE STATUS;

4
mysql-test/suite/rpl/t/rpl_perfschema_connect_config.test
View File

@@ -132,8 +132,8 @@ let $assert_cond= "$sss_value" = "$ps_value";
source include/assert.inc;
let $ps_value= query_get_value(select Connection_Retry_Count from performance_schema.replication_connection_configuration, Connection_Retry_Count, 1);
let $assert_text= Value returned by PS table for Connection_Retry_Count should be 10.; # master-retry-count=10, as part of default my.cnf used by MTR
let $assert_cond= "$ps_value" = 10;
let $assert_text= Value returned by PS table for Connection_Retry_Count should be 30.; # master-retry-count=10, as part of default my.cnf used by MTR
let $assert_cond= "$ps_value" = 30;
source include/assert.inc;
--echo