diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-02-18 18:56:32 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-02-18 18:59:05 +0100 |
| commit | 3a42926c88f8c3c582a7af7e482f6aded0c74f89 (patch) | |
| tree | 9a4e292f32e3a34a3c428507b8c96d3455bf70b1 /extra/mariabackup | |
| parent | 40b4f9c907e58a4b65677cc9e5b3f5deca8b7cb3 (diff) | |
| download | mariadb-git-3a42926c88f8c3c582a7af7e482f6aded0c74f89.tar.gz | |
MDEV-18204 Fix rocksdb incremental backup
Fix incremental prepare to copy #rocksdb subdirectory from the
incremental dir.
Diffstat (limited to 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/backup_copy.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index b0ad000cb90..bd2f28baa92 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -1635,6 +1635,19 @@ ibx_copy_incremental_over_full() } + if (directory_exists(ROCKSDB_BACKUP_DIR, false)) { + if (my_rmtree(ROCKSDB_BACKUP_DIR, MYF(0))) { + die("Can't remove " ROCKSDB_BACKUP_DIR); + } + } + snprintf(path, sizeof(path), "%s/" ROCKSDB_BACKUP_DIR, xtrabackup_incremental_dir); + if (directory_exists(path, false)) { + if (my_mkdir(ROCKSDB_BACKUP_DIR, 0777, MYF(0))) { + die("my_mkdir failed for " ROCKSDB_BACKUP_DIR); + } + copy_or_move_dir(path, ROCKSDB_BACKUP_DIR, true, true); + } + cleanup: if (it != NULL) { datadir_iter_free(it); |