MDEV-34425 mroonga files are not copied by mariabackup

Backing up with mariabackup a datadir containing
ENGINE=Mroonga tables leaves behind the corresponding
*.mrn* files. Those tables are therefore broken once
such backup is restored.

minor style/mtr changes by Daniel Black

Author: fdiary

extra/mariabackup/backup_copy.cc

@@ -1347,6 +1347,8 @@ backup_files(ds_ctxt *ds_data, const char *from)
 			}
 		}
 	}
+	if (!backup_mroonga_files_from_datadir(ds_data, from))
+		goto out;
 	msg("Finished backing up non-InnoDB tables and files");
 out:
 	datadir_iter_free(it);
@@ -1509,7 +1511,9 @@ ibx_copy_incremental_over_full()
 						      "aws-kms-key")) ||
 		    !(ret = backup_files_from_datadir(ds_data,
 						      xtrabackup_incremental_dir,
-						      "aria_log")))
+						      "aria_log")) ||
+		    !(ret = backup_mroonga_files_from_datadir(ds_data,
+						      xtrabackup_incremental_dir)))
 			goto cleanup;
 
 		/* copy supplementary files */
@@ -2068,6 +2072,47 @@ bool backup_files_from_datadir(ds_ctxt_t *ds_data,
 	return ret;
 }
 
+bool backup_mroonga_files_from_datadir(ds_ctxt_t *ds_data,
+                                       const char *dir_path)
+{
+	os_file_dir_t dir= os_file_opendir(dir_path);
+	if (dir == IF_WIN(INVALID_HANDLE_VALUE, nullptr)) return false;
+
+	os_file_stat_t info;
+	bool ret= true;
+	while (os_file_readdir_next_file(dir_path, dir, &info) == 0)
+	{
+
+		if (info.type != OS_FILE_TYPE_FILE)
+			continue;
+
+		const char *pname = strrchr(info.name, '/');
+#ifdef _WIN32
+		if (const char *last = strrchr(info.name, '\\'))
+		{
+			if (!pname || last > pname)
+				pname = last;
+		}
+#endif
+		if (!pname)
+			pname = info.name;
+
+		if (!strstr(pname, ".mrn"))
+			continue;
+
+		if (xtrabackup_prepare && xtrabackup_incremental_dir &&
+			file_exists(info.name))
+			unlink(info.name);
+
+		std::string full_path(dir_path);
+		full_path.append(1, '/').append(info.name);
+		if (!(ret = ds_data->copy_file(full_path.c_str() , info.name, 1)))
+			break;
+	}
+	os_file_closedir(dir);
+	return ret;
+}
+
 
 static int rocksdb_remove_checkpoint_directory()
 {

extra/mariabackup/backup_copy.h

@@ -52,6 +52,8 @@ const char *trim_dotslash(const char *path);
 bool backup_files_from_datadir(ds_ctxt_t *ds_data,
                                const char *dir_path,
                                const char *prefix);
+bool backup_mroonga_files_from_datadir(ds_ctxt_t *ds_data,
+                                       const char *dir_path);
 
 bool is_system_table(const char *dbname, const char *tablename);
 std::unique_ptr<std::vector<std::string>>

mysql-test/suite/mariabackup/mroonga.opt

@@ -0,0 +1 @@
+--loose-plugin-load-add=$HA_MROONGA_SO --loose-plugin-mroonga=ON

mysql-test/suite/mariabackup/mroonga.result

@@ -0,0 +1,15 @@
+#
+# MDEV-34425 mroonga files are not copied by mariabackup
+#
+CREATE TABLE t(c TEXT, FULLTEXT(c)) ENGINE=Mroonga;
+INSERT INTO t VALUES('Once upon a time'),('There was a wicked witch'),('Who ate everybody up');
+# mariadb-backup backup
+# shutdown server
+# remove datadir
+# xtrabackup move back
+# restart
+SELECT * FROM t WHERE MATCH(c) AGAINST('wicked');
+c
+There was a wicked witch
+DROP TABLE t;
+# End 10.11 tests

mysql-test/suite/mariabackup/mroonga.test

@@ -0,0 +1,23 @@
+if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'mroonga' AND PLUGIN_STATUS='ACTIVE'`)
+{
+  --skip needs mroonga plugin
+}
+
+--echo #
+--echo # MDEV-34425 mroonga files are not copied by mariabackup
+--echo #
+
+CREATE TABLE t(c TEXT, FULLTEXT(c)) ENGINE=Mroonga;
+INSERT INTO t VALUES('Once upon a time'),('There was a wicked witch'),('Who ate everybody up');
+echo # mariadb-backup backup;
+let $targetdir=$MYSQL_TMP_DIR/backup;
+--disable_result_log
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir;
+exec $XTRABACKUP  --prepare --target-dir=$targetdir;
+-- source include/restart_and_restore.inc
+--enable_result_log
+SELECT * FROM t WHERE MATCH(c) AGAINST('wicked');
+DROP TABLE t;
+rmdir $targetdir;
+
+--echo # End 10.11 tests