MDEV-39092 Copy Aria data and logs as part of backup

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/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/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_aria_concurrent.result

@@ -0,0 +1,20 @@
+15 30 7500
+Back up the database
+BACKUP SERVER TO '$target_directory' 4 CONCURRENT;
+Restore the database
+# restart: --datadir=MYSQLTEST_VARDIR/some_directory
+Check contents after restore
+SELECT COUNT(*) FROM table_checks;
+COUNT(*)
+400
+SELECT * FROM table_checks WHERE sum_id <> 15;
+tbl_name	sum_id	str_len	blob_len	num_rows
+SELECT * FROM table_checks WHERE str_len <> 30;
+tbl_name	sum_id	str_len	blob_len	num_rows
+SELECT * FROM table_checks WHERE blob_len <> 7500;
+tbl_name	sum_id	str_len	blob_len	num_rows
+SELECT * FROM table_checks WHERE num_rows <> 5;
+tbl_name	sum_id	str_len	blob_len	num_rows
+Restart database in original data directory 
+# restart
+Clean up

mysql-test/suite/backup/backup_aria_concurrent.test

@@ -0,0 +1,145 @@
+
+--source include/have_aria.inc
+
+--disable_query_log
+
+
+DELIMITER //;
+CREATE PROCEDURE populate_data(IN t_name VARCHAR(64), IN num_rows INT)
+BEGIN
+  DECLARE i INT DEFAULT 1;
+  SET @query = CONCAT('INSERT INTO ', t_name, ' (id, str_val, blob_val) VALUES (?, ?, ?)');
+  PREPARE stmt FROM @query;
+
+  WHILE i <= num_rows DO
+    SET @str = CONCAT('_row_', i);
+    # Generate a predictable but repeating blob based on the row index
+    SET @blb = REPEAT(CHAR(97 + (i % 26)), 1500); 
+    EXECUTE stmt USING i, @str, @blb;
+    SET i = i + 1;
+  END WHILE;
+
+  DEALLOCATE PREPARE stmt;
+END//
+DELIMITER ;//
+
+# Create this many tables transactional and non-transactional each
+let $tab_num= 200;
+let $num_rows= 5;
+
+let $i = 1;
+while ($i <= $tab_num) {
+
+ # Create Transactional Table
+
+  let $tr=0;
+  while ($tr <= 1) {
+
+    let $suff= _$i;
+    let $table_name= ta_tr$tr$suff;
+
+    eval CREATE TABLE $table_name (
+      id INT PRIMARY KEY,
+      str_val VARCHAR(255),
+      blob_val BLOB,
+      INDEX idx_str (str_val)
+    ) ENGINE=Aria TRANSACTIONAL=$tr;
+
+    eval CALL populate_data('$table_name', $num_rows);
+
+    inc $tr;
+  }
+
+  inc $i;
+}
+
+--enable_query_log
+
+# All tables have the same data, so we query only one  for reference
+
+let $sum_id= `SELECT SUM(id) FROM ta_tr0_1`;
+let $str_len= `SELECT SUM(LENGTH(str_val)) FROM ta_tr0_1`;
+let $blob_len= `SELECT SUM(LENGTH(blob_val)) FROM ta_tr0_1`;
+
+echo $sum_id $str_len $blob_len;
+
+--let $target_directory=$MYSQLTEST_VARDIR/some_directory
+
+# Clean up after a previous failed test, in case we are retrying.
+--error 0,1
+--rmdir $target_directory
+
+--echo Back up the database
+evalp BACKUP SERVER TO '$target_directory' 4 CONCURRENT;
+
+--echo Restore the database
+--let $restart_parameters=--datadir=$target_directory
+--source include/restart_mysqld.inc
+
+--echo Check contents after restore
+
+--disable_query_log
+CREATE TEMPORARY TABLE table_checks (
+  tbl_name VARCHAR(64),
+  sum_id INT,
+  str_len INT,
+  blob_len INT,
+  num_rows INT
+) ENGINE=MEMORY;
+
+let $i = 1;
+while ($i <= $tab_num) {
+  let $tr=0;
+  while ($tr <= 1) {
+
+    let $suff= _$i;
+    let $table_name= ta_tr$tr$suff;
+
+    let $r_sum_id= `SELECT SUM(id) FROM $table_name`;
+    let $r_str_len= `SELECT SUM(LENGTH(str_val)) FROM $table_name`;
+    let $r_blob_len= `SELECT SUM(LENGTH(blob_val)) FROM $table_name`;
+    let $r_num_rows= `SELECT COUNT(*) FROM $table_name`;
+
+    eval INSERT INTO table_checks VALUES ('$table_name', $r_sum_id, $r_str_len, $r_blob_len, $r_num_rows);
+
+    inc $tr;
+  }
+  inc $i;
+}
+
+--enable_query_log
+
+SELECT COUNT(*) FROM table_checks;
+
+# We expect results in the table to always match the results captured before the BACKUP
+# Returned rowsets should be empty
+eval SELECT * FROM table_checks WHERE sum_id <> $sum_id;
+eval SELECT * FROM table_checks WHERE str_len <> $str_len;
+eval SELECT * FROM table_checks WHERE blob_len <> $blob_len;
+eval SELECT * FROM table_checks WHERE num_rows <> $num_rows;
+
+--echo Restart database in original data directory 
+--let $restart_parameters=
+--source include/restart_mysqld.inc
+
+--echo Clean up
+
+--disable_query_log
+
+let $i = 1;
+while ($i <= $tab_num) {
+  let $tr=0;
+  while ($tr <= 1) {
+    let $suff= _$i;
+    let $table_name= ta_tr$tr$suff;
+    eval DROP TABLE $table_name;
+    inc $tr;
+  } 
+  inc $i;
+}
+
+DROP PROCEDURE populate_data;
+
+--enable_query_log
+
+--rmdir $MYSQLTEST_VARDIR/some_directory

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' 4 CONCURRENT;
++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