MDEV-39061 mariadb-backup compatible wrappers for BACKUP SERVER

libmysqld/CMakeLists.txt

@@ -166,6 +166,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/opt_hints.cc ../sql/opt_hints.h
 	   ../sql/opt_trace_ddl_info.cc ../sql/opt_trace_ddl_info.h
            ../sql/sql_path.cc
+           ../sql/sql_backup.cc
            ${GEN_SOURCES}
            ${MYSYS_LIBWRAP_SOURCE}
 )

mysql-test/collections/buildbot_suites.bat

@@ -6,6 +6,7 @@ innodb,^
 versioning,^
 plugins,^
 mariabackup,^
+backup,^
 roles,^
 auth_gssapi,^
 mysql_sha2,^

mysql-test/include/have_mariabackup_wrapper.inc

@@ -0,0 +1,56 @@
+# ==== Purpose ====
+#
+# Redirect `$XTRABACKUP` so existing test invocations like
+#
+#     --exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf \
+#         --backup --target-dir=$targetdir
+#
+# run through scripts/mariabackup/mariabackup.sh — the BACKUP SERVER
+# compatibility wrapper — without any change to the test body.
+#
+#
+# Skip the test if any of these are missing:
+#   - the wrapper script
+#   - bash
+#   - the mariadb client (wrapper shells out to it)
+#
+# ==== Usage ====
+#
+#   --source include/have_mariabackup_wrapper.inc
+#   # ... rest of the test, using $XTRABACKUP as usual ...
+#
+# ==== Exposed variables ====
+#
+#   $XTRABACKUP        — now points at mariabackup.sh
+
+--source include/linux.inc
+
+--let MARIABACKUP_WRAPPER=$MYSQL_TEST_DIR/../scripts/mariabackup/mariabackup.sh
+
+--error 0,1
+perl;
+use strict;
+use warnings;
+use File::Basename;
+
+my $wrapper = $ENV{MARIABACKUP_WRAPPER};
+exit 1 unless $wrapper && -x $wrapper;
+
+chomp(my $bash = `command -v bash 2>/dev/null`);
+exit 1 unless $bash && -x $bash;
+
+# Prepend its directory to PATH so the bare `mariadb` invocation
+# inside the wrapper resolves.
+my ($mariadb) = split /\s+/, ($ENV{MYSQL} // '');
+exit 1 unless $mariadb && -x $mariadb;
+$ENV{PATH} = dirname($mariadb) . ":$ENV{PATH}";
+
+exit 0;
+EOF
+
+if ($errno)
+{
+  --skip mariabackup.sh wrapper unavailable (script, bash, or mariadb client missing)
+}
+
+--let XTRABACKUP=$MARIABACKUP_WRAPPER

mysql-test/main/backup_server.result

@@ -0,0 +1,6 @@
+BACKUP SERVER TO '$datadir/some_directory';
+ERROR HY000: Incorrect arguments to BACKUP SERVER TO
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+ERROR HY000: Can't create directory 'MYSQLTEST_VARDIR/some_directory' (Errcode: 17 "File exists")
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';

mysql-test/main/backup_server.test

@@ -0,0 +1,10 @@
+--let $datadir=`select @@datadir`
+--error ER_WRONG_ARGUMENTS
+evalp BACKUP SERVER TO '$datadir/some_directory';
+evalp BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error 21
+evalp BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+--rmdir $MYSQLTEST_VARDIR/some_directory
+evalp BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+--rmdir $MYSQLTEST_VARDIR/some_directory

mysql-test/main/backup_server_locking.result

@@ -0,0 +1,17 @@
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+ERROR HY000: Can't create directory 'MYSQLTEST_VARDIR/some_directory' (Errcode: 17 "File exists")
+BACKUP STAGE START;
+connect  backup,localhost,root;
+SET STATEMENT max_statement_time=0.1 FOR
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+ERROR 70100: Query was interrupted: execution time limit 0.1 sec exceeded
+connection default;
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+ERROR HY000: Can't execute the command as you have a BACKUP STAGE active
+BACKUP STAGE END;
+connection backup;
+SET STATEMENT max_statement_time=0.1 FOR
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+ERROR HY000: Can't create directory 'MYSQLTEST_VARDIR/some_directory' (Errcode: 17 "File exists")
+disconnect backup;
+connection default;

mysql-test/main/backup_server_locking.test

@@ -0,0 +1,31 @@
+--source include/not_embedded.inc
+--source include/count_sessions.inc
+
+--mkdir $MYSQLTEST_VARDIR/some_directory
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error 21
+evalp BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+
+BACKUP STAGE START;
+--connect (backup,localhost,root)
+--error ER_STATEMENT_TIMEOUT
+evalp SET STATEMENT max_statement_time=0.1 FOR
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+
+--connection default
+
+--error ER_BACKUP_LOCK_IS_ACTIVE
+evalp BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+
+BACKUP STAGE END;
+--connection backup
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error 21
+evalp SET STATEMENT max_statement_time=0.1 FOR
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+--disconnect backup
+--connection default
+
+--rmdir $MYSQLTEST_VARDIR/some_directory
+
+--source include/wait_until_count_sessions.inc

mysql-test/main/backup_server_restore.result

@@ -0,0 +1,41 @@
+Prepare database
+CREATE TABLE tinno (i INTEGER) ENGINE=InnoDB;
+INSERT INTO tinno VALUES (1), (2), (3), (4);
+CREATE TABLE tariatr (i INTEGER) ENGINE=Aria TRANSACTIONAL=1;
+INSERT INTO tariatr VALUES (2), (3), (5), (7);
+CREATE TABLE tariant (i INTEGER) ENGINE=Aria TRANSACTIONAL=0;
+INSERT INTO tariant VALUES (1), (1), (2), (3), (5);
+Back up the database
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+Restore the database
+# restart: --datadir=MYSQLTEST_VARDIR/some_directory
+Check contents after restore
+SELECT * FROM tinno;
+i
+1
+2
+3
+4
+SELECT * FROM tariatr;
+i
+2
+3
+5
+7
+SELECT * FROM tariant;
+i
+1
+1
+2
+3
+5
+Warnings:
+Error	145	Got error '145 "Table was marked as crashed and should be repaired"' for './test/tariant'
+Warning	1034	1 client is using or hasn't closed the table properly
+Note	1034	Table is fixed
+Restart database in original data directory 
+# restart
+Clean up
+DROP TABLE tinno;
+DROP TABLE tariatr;
+DROP TABLE tariant;

mysql-test/main/backup_server_restore.test

@@ -0,0 +1,38 @@
+--source include/not_windows.inc
+--source include/have_innodb.inc
+
+--echo Prepare database
+CREATE TABLE tinno (i INTEGER) ENGINE=InnoDB;
+INSERT INTO tinno VALUES (1), (2), (3), (4);
+CREATE TABLE tariatr (i INTEGER) ENGINE=Aria TRANSACTIONAL=1;
+INSERT INTO tariatr VALUES (2), (3), (5), (7);
+CREATE TABLE tariant (i INTEGER) ENGINE=Aria TRANSACTIONAL=0;
+INSERT INTO tariant VALUES (1), (1), (2), (3), (5);
+
+--echo Back up the database
+evalp BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+
+--echo Restore the database
+--disable_query_log
+call mtr.add_suppression("InnoDB: Did not find any checkpoint after LSN=");
+call mtr.add_suppression("InnoDB: Renaming ib_[0-9]+.log to ib_logfile0");
+call mtr.add_suppression("mariadbd: Got error '145 \"Table was marked as crashed and should be repaired\"' for ");
+call mtr.add_suppression("Checking table: ");
+--enable_query_log
+--let $restart_parameters=--datadir=$MYSQLTEST_VARDIR/some_directory
+--source include/restart_mysqld.inc
+
+--echo Check contents after restore
+SELECT * FROM tinno;
+SELECT * FROM tariatr;
+SELECT * FROM tariant;
+
+--echo Restart database in original data directory 
+--let $restart_parameters=
+--source include/restart_mysqld.inc
+
+--echo Clean up
+DROP TABLE tinno;
+DROP TABLE tariatr;
+DROP TABLE tariant;
+--rmdir $MYSQLTEST_VARDIR/some_directory

mysql-test/main/grant_backup_server.result

@@ -0,0 +1,27 @@
+CREATE USER user1@localhost IDENTIFIED BY '';
+connect con1,localhost,user1;
+BACKUP SERVER TO 'some_directory';
+ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
+disconnect con1;
+connection default;
+GRANT SELECT ON test.* TO user1@localhost;
+connect con1,localhost,user1;
+BACKUP SERVER TO 'some_directory';
+ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
+disconnect con1;
+connection default;
+GRANT RELOAD ON test.* TO user1@localhost;
+ERROR HY000: Incorrect usage of DB GRANT and GLOBAL PRIVILEGES
+GRANT RELOAD ON *.* TO user1@localhost;
+connect con1,localhost,user1;
+BACKUP SERVER TO 'some_directory';
+ERROR 42000: Access denied; you need (at least one of) the SELECT privilege(s) for this operation
+disconnect con1;
+connection default;
+GRANT SELECT ON *.* TO user1@localhost;
+connect con1,localhost,user1;
+BACKUP SERVER TO '$datadir/some_directory';
+ERROR HY000: Incorrect arguments to BACKUP SERVER TO
+disconnect con1;
+connection default;
+DROP USER user1@localhost;

mysql-test/main/grant_backup_server.test

@@ -0,0 +1,29 @@
+--source include/not_embedded.inc
+CREATE USER user1@localhost IDENTIFIED BY '';
+--connect con1,localhost,user1
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+BACKUP SERVER TO 'some_directory';
+--disconnect con1
+--connection default
+GRANT SELECT ON test.* TO user1@localhost;
+--connect con1,localhost,user1
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+BACKUP SERVER TO 'some_directory';
+--disconnect con1
+--connection default
+--error ER_WRONG_USAGE
+GRANT RELOAD ON test.* TO user1@localhost;
+GRANT RELOAD ON *.* TO user1@localhost;
+--connect con1,localhost,user1
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+BACKUP SERVER TO 'some_directory';
+--disconnect con1
+--connection default
+GRANT SELECT ON *.* TO user1@localhost;
+--connect con1,localhost,user1
+--let $datadir=`select @@datadir`
+--error ER_WRONG_ARGUMENTS
+evalp BACKUP SERVER TO '$datadir/some_directory';
+--disconnect con1
+--connection default
+DROP USER user1@localhost;

mysql-test/main/mysqld--help.result

@@ -2053,7 +2053,7 @@ performance-schema-max-socket-classes 10
 performance-schema-max-socket-instances -1
 performance-schema-max-sql-text-length 1024
 performance-schema-max-stage-classes 170
-performance-schema-max-statement-classes 227
+performance-schema-max-statement-classes 228
 performance-schema-max-statement-stack 10
 performance-schema-max-table-handles -1
 performance-schema-max-table-instances -1

mysql-test/mariadb-test-run.pl

@@ -180,6 +180,7 @@ END
     main-
     archive-
     atomic-
+    backup-
     binlog-
     binlog_encryption-
     binlog_in_engine-

mysql-test/suite/backup/backup_innodb,debug.rdiff

@@ -0,0 +1,16 @@
+--- backup_innodb.result
++++ backup_innodb,debug.result
+@@ -10,7 +10,13 @@
+ BEGIN;
+ DELETE FROM t;
+ connect backup,localhost,root;
++SET DEBUG_SYNC='innodb_backup_start SIGNAL start WAIT_FOR resume';
+ BACKUP SERVER TO 'target_directory';
++connection default;
++SET DEBUG_SYNC='now WAIT_FOR start';
++INSERT INTO t(a) SELECT * FROM seq_1_to_30000;
++SET DEBUG_SYNC='now SIGNAL resume';
++connection backup;
+ disconnect backup;
+ connection default;
+ ROLLBACK;

mysql-test/suite/backup/backup_innodb.combinations

@@ -0,0 +1,4 @@
+[archived]
+innodb_log_archive=ON
+[circular]
+innodb_log_archive=OFF

mysql-test/suite/backup/backup_innodb.result

@@ -0,0 +1,30 @@
+CREATE TABLE t(a INT PRIMARY KEY, b CHAR(255) DEFAULT '' NOT NULL, INDEX(b))
+ENGINE=INNODB;
+BEGIN;
+INSERT INTO t SET a=1;
+BACKUP SERVER TO '$target_directory';
+ROLLBACK;
+SELECT * FROM t;
+a	b
+1	
+BEGIN;
+DELETE FROM t;
+connect backup,localhost,root;
+BACKUP SERVER TO 'target_directory';
+disconnect backup;
+connection default;
+ROLLBACK;
+SELECT * FROM t;
+a	b
+1	
+DELETE FROM t;
+# restart: --defaults-file=MYSQLTEST_VARDIR/some_directory/backup.cnf --datadir=MYSQLTEST_VARDIR/some_directory
+SELECT * FROM t;
+a	b
+1	
+DELETE FROM t;
+ERROR HY000: Table 't' is read only
+# restart
+SELECT * FROM t;
+a	b
+DROP TABLE t;