diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-16 17:11:25 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-18 11:01:34 +0000 |
| commit | 40c7778e05120fe7972fdfea15fb2db5b98579c6 (patch) | |
| tree | 8f660e8736c531e56d6376b95e7d2023f7b9ff3b | |
| parent | f302a3cf9d9de48cae660641ec9695412f74b80e (diff) | |
| download | mariadb-git-40c7778e05120fe7972fdfea15fb2db5b98579c6.tar.gz | |
MDEV-12814 mariabackup : don't try io throttling in copy-back
Throttling only works with when creating backup. Attempt to use it with
--copy-back results in crash, since throttle events are not initialized.
Thus, ignore throttling unless --backup is given.
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/include/restart_and_restore.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index c116d119cee..98a1bfb810e 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2169,7 +2169,7 @@ xb_write_delta_metadata(const char *filename, const xb_delta_info_t *info) void xtrabackup_io_throttling(void) { - if (xtrabackup_throttle && (io_ticket--) < 0) { + if (xtrabackup_backup && xtrabackup_throttle && (io_ticket--) < 0) { os_event_reset(wait_throttle); os_event_wait(wait_throttle); } diff --git a/mysql-test/suite/mariabackup/include/restart_and_restore.inc b/mysql-test/suite/mariabackup/include/restart_and_restore.inc index 39616cc6f15..7ee4a660b78 100644 --- a/mysql-test/suite/mariabackup/include/restart_and_restore.inc +++ b/mysql-test/suite/mariabackup/include/restart_and_restore.inc @@ -7,7 +7,7 @@ shutdown_server; echo # remove datadir; rmdir $_datadir; echo # xtrabackup move back; -exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2; +exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2 --throttle=1; echo # restart server; exec echo "restart" > $_expect_file_name; enable_reconnect; |