diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 1b1091280f1..fc57eed6c85 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -4,7 +4,7 @@ MariaBackup: hot backup tool for InnoDB Originally Created 3/3/2009 Yasufumi Kinoshita Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko, Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz. -(c) 2017, 2020, MariaDB Corporation. +(c) 2017, 2021, MariaDB Corporation. Portions written by Marko Mäkelä. This program is free software; you can redistribute it and/or modify @@ -2168,6 +2168,14 @@ error: static bool innodb_init() { bool create_new_db = false; + + if (srv_io_capacity >= SRV_MAX_IO_CAPACITY_LIMIT / 2) { + /* Avoid overflow. */ + srv_max_io_capacity = SRV_MAX_IO_CAPACITY_LIMIT; + } else { + srv_max_io_capacity = std::max(2 * srv_io_capacity, 2000UL); + } + /* Check if the data files exist or not. */ dberr_t err = srv_sys_space.check_file_spec(&create_new_db, 5U << 20); @@ -5603,6 +5611,10 @@ static bool xtrabackup_prepare_func(char** argv) if (xtrabackup_incremental) inc_dir_tables_hash.create(1000); + msg("open files limit requested %u, set to %lu", + (uint) xb_open_files_limit, + xb_set_max_open_files(xb_open_files_limit)); + /* Fix DDL for prepare. Process .del,.ren, and .new files. The order in which files are processed, is important (see MDEV-18185, MDEV-18201) |