mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-29445 fixup: galera_sst_mariabackup_use_memory

Browse source 
The mariadb-backup --use-memory parameter will be trimmed to a multiple
of 8 MiB, or 2 MiB on 32-bit systems.

Also, let us remove a bogus message in mariadb-backup:
Warning: option 'use-memory': signed value -1 adjusted to 8388608
This commit is contained in:
Marko Mäkelä 2025-03-27 08:54:00 +02:00
commit 9a6540cb84
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
extra/mariabackup/xtrabackup.cc
View file

@ -1413,8 +1413,9 @@ struct my_option xb_client_options[]= {
"The value is used in place of innodb_buffer_pool_size. "
"This option is only relevant when the --prepare option is specified.",
(G_PTR *) &xtrabackup_use_memory, (G_PTR *) &xtrabackup_use_memory, 0,
GET_LL, REQUIRED_ARG, 96 << 20, innodb_buffer_pool_extent_size,
SIZE_T_MAX, 0, innodb_buffer_pool_extent_size, 0},
GET_ULL, REQUIRED_ARG, 96 << 20, innodb_buffer_pool_extent_size,
size_t(-ssize_t(innodb_buffer_pool_extent_size)),
0, innodb_buffer_pool_extent_size, 0},
{"throttle", OPT_XTRA_THROTTLE,
"limit count of IO operations (pairs of read&write) per second to IOS "
"values (for '--backup')",

2
mysql-test/suite/galera/r/galera_sst_mariabackup_use_memory.result
View file

@ -8,6 +8,6 @@ connection node_1;
Cleaning var directory ...
connection node_2;
Starting server ...
include/assert_grep.inc [mariabackup: Using 128974848 bytes for buffer pool \(set by --use-memory parameter\)]
include/assert_grep.inc [mariabackup: Using 134217728 bytes for buffer pool \(set by --use-memory parameter\)]
disconnect node_2;
disconnect node_1;

2
mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.cnf
View file

@ -5,4 +5,4 @@ wsrep_sst_method=mariabackup
wsrep_sst_auth="root:"
[mariabackup]
use_memory=123m
use_memory=129m

4
mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.test
View file

@ -40,8 +40,8 @@ let $restart_noprint=2;
--source include/wait_condition.inc
# Confirm that IST did not take place
--let $assert_text = mariabackup: Using 128974848 bytes for buffer pool \(set by --use-memory parameter\)
--let $assert_select = mariabackup: Using 128974848 bytes for buffer pool \(set by --use-memory parameter\)
--let $assert_text = mariabackup: Using 134217728 bytes for buffer pool \(set by --use-memory parameter\)
--let $assert_select = mariabackup: Using 134217728 bytes for buffer pool \(set by --use-memory parameter\)
--let $assert_count = 1
--let $assert_file = $MYSQLTEST_VARDIR/mysqld.2/data/mariabackup.prepare.log
--let $assert_only_after = Starting InnoDB instance for recovery