Merge branch 'PXB-2724-8.0' into PXB-2724-8.4

Author: jakub-nowakowski-percona

storage/innobase/xtrabackup/src/backup_copy.cc

@@ -923,7 +923,7 @@ static bool copy_or_move_file(const char *src_file_path,
   ds_ctxt_t *datasink = ds_data; /* copy to datadir by default */
   bool ret;
 
-  /* File is located outsude of the datadir */
+  /* File is located outside of the datadir */
   char external_dir[FN_REFLEN];
 
   if (Fil_path::type_of_path(dst_file_path) == Fil_path::absolute) {
@@ -1298,20 +1298,27 @@ Myrocks_checkpoint::file_list Myrocks_checkpoint::data_files() const {
   return Myrocks_datadir(checkpoint_dir).data_files();
 }
 
-static void par_copy_rocksdb_files(const Myrocks_datadir::const_iterator &start,
-                                   const Myrocks_datadir::const_iterator &end,
-                                   size_t thread_n, ds_ctxt_t *ds,
-                                   bool *result) {
+static void par_copy_or_move_rocksdb_files(
+    const Myrocks_datadir::const_iterator &start,
+    const Myrocks_datadir::const_iterator &end, size_t thread_n, ds_ctxt_t *ds,
+    bool *result) {
   for (auto it = start; it != end; it++) {
     if (ends_with(it->path.c_str(), ".qp") ||
         ends_with(it->path.c_str(), ".lz4") ||
         ends_with(it->path.c_str(), ".zst") ||
         ends_with(it->path.c_str(), ".xbcrypt")) {
       continue;
     }
-    if (!copy_file(ds, it->path.c_str(), it->rel_path.c_str(), thread_n,
-                   FILE_PURPOSE_OTHER, it->file_size)) {
-      *result = false;
+    if (xtrabackup_copy_back) {
+      if (!copy_file(ds, it->path.c_str(), it->rel_path.c_str(), thread_n,
+                     FILE_PURPOSE_OTHER, it->file_size)) {
+        *result = false;
+      }
+    } else {
+      if (!move_file(ds, it->path.c_str(), it->rel_path.c_str(), ds->root,
+                     thread_n, FILE_PURPOSE_OTHER)) {
+        *result = false;
+      }
     }
     if (!*result) {
       break;
@@ -1944,7 +1951,8 @@ bool copy_incremental_over_full() {
     bool result = true;
     std::function<void(const Myrocks_datadir::const_iterator &,
                        const Myrocks_datadir::const_iterator &, size_t)>
-        copy = std::bind(&par_copy_rocksdb_files, _1, _2, _3, ds_data, &result);
+        copy = std::bind(&par_copy_or_move_rocksdb_files, _1, _2, _3, ds_data,
+                         &result);
 
     par_for(PFS_NOT_INSTRUMENTED, rocksdb.files(), xtrabackup_parallel, copy);
   }
@@ -2445,7 +2453,8 @@ bool copy_back(int argc, char **argv) {
     using std::placeholders::_3;
     std::function<void(const Myrocks_datadir::const_iterator &,
                        const Myrocks_datadir::const_iterator &, size_t)>
-        copy = std::bind(&par_copy_rocksdb_files, _1, _2, _3, ds_data, &ret);
+        copy = std::bind(&par_copy_or_move_rocksdb_files, _1, _2, _3, ds_data,
+                         &ret);
 
     if (rocksdb_wal_dir.empty()) {
       par_for(PFS_NOT_INSTRUMENTED, rocksdb.files("", ""), xtrabackup_parallel,
@@ -2479,7 +2488,8 @@ bool copy_back(int argc, char **argv) {
       using std::placeholders::_3;
       std::function<void(const Myrocks_datadir::const_iterator &,
                          const Myrocks_datadir::const_iterator &, size_t)>
-          copy = std::bind(&par_copy_rocksdb_files, _1, _2, _3, ds_data, &ret);
+          copy = std::bind(&par_copy_or_move_rocksdb_files, _1, _2, _3, ds_data,
+                           &ret);
 
       par_for(PFS_NOT_INSTRUMENTED, rocksdb.wal_files(""), xtrabackup_parallel,
               copy);

storage/innobase/xtrabackup/test/suites/rocksdb/ddl.sh

@@ -115,6 +115,11 @@ stop_server
 rm -rf $mysql_datadir
 xtrabackup --move-back --target-dir=$topdir/backup
 
+# Check if RocksDB files have been moved (--move-back).
+if ls $topdir/backup/.rocksdb/* 1>/dev/null 2>&1 ; then
+    die "RocksDB files haven't been moved."
+fi
+
 start_server
 
 # Verify backup