Skip to content

Commit 2fb4407

Browse files
committed
MDEV-25818: RSYNC SST failed due to busy port
This commit reduces the likelihood of getting a busy port on quick restarts with rsync SST (problem MDEV-25818) and fixes a number of other flaws in SST scripts, adds new functionality, and also synchronizes the xtrabackup-v2 script with the mariabackup script (the latter applies only to the 10.2 branch): 1) SST via rsync: rsync and stunnel does not always get the right time to complete by correctly handling SIGTERM. These utilities are now given more time to complete normally (via normal SIGTERM processing) before we move on to using "kill -9"; 2) SST via rsync: attempts to terminate an rsync or stunnel process (via "kill" utility) are only made if it did not terminated on its own; 3) SST via rsync: if a combination of stunnel and rsync is used, then we need to wait for both utilities to finish or stop, not just one of them; 4) The config file and pid file for stunnel are now deleted after successful completion of SST on the donor node; 5) The configs and pid files from rsync and stunnel should not be deleted unless these utilities succeed (or are sucessfully terminated) on the joiner node; 6) The configs and pid files now excluded from transfer via rsync; 7) Spaces in paths are now valid for config files as well (when used with SST via rsync or mariabackup / xtrabackup[-v2]); 8) SST via mariabackup: added preliminary verification of keys and certificates that are used when establishing a connection using SSL (to avoid long timeouts and improve diagnostics) - by analogy with how it is done for the xtrabackup-v2 (plus check for CA file), while that check is skipped if the user does not have openssl installed (or does not have diff utility); 9) Added backup-threads=<n> configuration option which adds "--parallel=<n>" for mariabackup / xtrabackup at backup and move-back stages; 10) Added encrypt-threads and encrypt-chunk-size configuration options for xbcrypt management (when xbcrypt is used); 11) Small optimization: checking the socat version and adding a file with parameters for 2048-bit Diffie-Hellman (if necessary) is done only if the user has not specified "dhparam=" in the "sockopt" option value; 12) SST via rsync now supports "backup-threads" configuration option (in server-related sections or in the "[sst]"); 13) Determining the number of available processors is now supported for FreeBSD + mariabackup/xtrabackup: before that we might have problems with "--compact" (rebuild indexes) or qpress on FreeBSD; 14) The check_pid() function should not raise an error state in the rare cases when the pid file was created, but it is empty, or if it is deleted right during the check, or when zero is read from the pid file; 15) Iproved templates that are used to check if a requested socket is "listening" when using the ss utility; 16) Shortened some other templates for socket state utilities; 17) Temporary files created by mariabackup / xtrabackup are moved to a separate subdirectory inside tmpdir (so they don't get mixed with other temporary files, which can make debugging more difficult); 18) 10.2 only: the script for SST via xtrabackup-v2 has been brought in full compliance with all the bugfixes made for mariabackup (as it previously contained many flaws compared to the updated script for mariabackup).
1 parent d3c77e0 commit 2fb4407

17 files changed

+1169
-817
lines changed

mysql-test/suite/galera/t/galera_autoinc_sst_xtrabackup.cnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ wsrep_provider_options='[email protected].#galera_port;gcache.size=1;pc.ignore
1010

1111
[mysqld.2]
1212
wsrep_provider_options='[email protected].#galera_port;gcache.size=1;pc.ignore_sb=true'
13-

mysql-test/suite/galera/t/galera_ist_mariabackup.cnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ wsrep_provider_options='[email protected].#galera_port;pc.ignore_sb=true'
99

1010
[mysqld.2]
1111
wsrep_provider_options='[email protected].#galera_port;pc.ignore_sb=true'
12-

mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.cnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ wsrep_provider_options='[email protected].#galera_port;pc.ignore_sb=true'
1111

1212
[mysqld.2]
1313
wsrep_provider_options='[email protected].#galera_port;pc.ignore_sb=true'
14-

mysql-test/suite/galera/t/galera_ist_mysqldump.cnf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ wsrep_provider_options='[email protected].#galera_port;pc.ignore_sb=true'
88

99
[mysqld.2]
1010
wsrep_provider_options='[email protected].#galera_port;pc.ignore_sb=true'
11-
12-

mysql-test/suite/galera/t/galera_ist_xtrabackup-v2.cnf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ wsrep_sst_method=xtrabackup-v2
55
wsrep_sst_auth=root:
66
innodb_safe_truncate=OFF
77

8-
98
[mysqld.1]
109
wsrep_provider_options='[email protected].#galera_port;pc.ignore_sb=true'
1110

1211
[mysqld.2]
1312
wsrep_provider_options='[email protected].#galera_port;pc.ignore_sb=true'
14-

mysql-test/suite/galera/t/galera_sst_mariabackup.cnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ wsrep_provider_options='[email protected].#galera_port;gcache.size=1;pc.ignore
1313

1414
[sst]
1515
transferfmt[email protected]_GALERA_TFMT
16-
streamfmt=xbstream
16+
streamfmt=mbstream

mysql-test/suite/galera/t/galera_sst_mariabackup_qpress.cnf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ [email protected]_GALERA_TFMT
1010
compress=quicklz
1111
compress-threads=2
1212
compress-chunk-size=32768
13+
backup-threads=2

mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.cnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ wsrep_provider_options='[email protected].#galera_port;gcache.size=1;pc.ignore
1515

1616
[sst]
1717
transferfmt[email protected]_GALERA_TFMT
18-
streamfmt=xbstream
18+
streamfmt=mbstream

mysql-test/suite/galera/t/galera_sst_rsync.cnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ wsrep_provider_options='[email protected].#galera_port;gcache.size=1;pc.ignore
88

99
[mysqld.2]
1010
wsrep_provider_options='[email protected].#galera_port;gcache.size=1;pc.ignore_sb=true'
11-

mysql-test/suite/galera/t/galera_sst_rsync2.cnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ [email protected]_VARDIR/tmp/server1_binlog_index.index
1212
wsrep_provider_options='[email protected].#galera_port;gcache.size=1;pc.ignore_sb=true'
1313
log_bin[email protected]_VARDIR/server2_binlog
1414
log_bin_index[email protected]_VARDIR/tmp/server2_binlog_index.index
15-

0 commit comments

Comments
 (0)