MDEV-39061 mariadb-backup compatible wrappers for BACKUP SERVER

extra/mariabackup/CMakeLists.txt

@@ -114,3 +114,23 @@ ADD_DEPENDENCIES(mbstream GenError)
 IF(MSVC)
   SET_TARGET_PROPERTIES(mbstream PROPERTIES LINK_FLAGS setargv.obj)
 ENDIF()
+
+
+########################################################################
+# mariadb-backup-server: BACKUP SERVER-compatible shell wrapper
+########################################################################
+# A drop-in mariadb-backup-compatible POSIX-sh wrapper that translates the
+# CLI into server-side BACKUP SERVER SQL. Experimental; OFF by default
+# Installed as a mariadb-backup-server; clients opt in via symlink/alias
+# (see scripts/mariabackup/README.md).
+OPTION(WITH_MARIABACKUP_WRAPPER
+  "Install the BACKUP SERVER shell wrapper (mariadb-backup-server)" OFF)
+ADD_FEATURE_INFO(MARIABACKUP_WRAPPER WITH_MARIABACKUP_WRAPPER
+  "BACKUP SERVER-compatible mariadb-backup shell wrapper")
+
+IF(WITH_MARIABACKUP_WRAPPER AND NOT WIN32)
+  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/scripts/mariabackup/mariabackup.sh
+    ${CMAKE_CURRENT_BINARY_DIR}/mariadb-backup-server COPYONLY)
+  INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/mariadb-backup-server
+    DESTINATION ${INSTALL_BINDIR} COMPONENT Backup)
+ENDIF()

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_combination.combinations

@@ -0,0 +1,3 @@
+[OLD]
+
+[NEW]

mysql-test/include/have_mariabackup_combination.inc

@@ -0,0 +1,5 @@
+if ($MTR_COMBINATION_NEW)
+{
+  --source include/have_mariabackup_wrapper.inc
+}
+

mysql-test/include/have_mariabackup_wrapper.inc

@@ -0,0 +1,35 @@
+# 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.
+#
+#   --source include/have_mariabackup_wrapper.inc
+#   # ... rest of the test, using $XTRABACKUP as usual ...
+#
+#   $XTRABACKUP        — now points at mariabackup.sh
+
+--source include/linux.inc
+
+--let MARIABACKUP_WRAPPER=$MYSQL_TEST_DIR/../scripts/mariabackup/mariabackup.sh
+
+# The wrapper shells out to the bare `mariadb` client, which mtr does not put
+# on PATH. Prepend the build's client directories so it resolves. A `let` with
+# no leading $ is exported to the environment of later --exec commands.
+--let PATH=$MYSQL_BINDIR/client:$MYSQL_BINDIR/client_release:$MYSQL_BINDIR/client_debug:$MYSQL_BINDIR/bin:$PATH
+
+--error 0,1
+perl;
+my $w = $ENV{MARIABACKUP_WRAPPER};
+exit 1 unless $w && -x $w && -x "/bin/sh";
+exit 0;
+EOF
+
+if ($errno)
+{
+  --skip mariabackup.sh wrapper unavailable (script or sh 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/bootstrap_innodb.result

@@ -1,8 +1,12 @@
 create table t1(a int) engine=innodb;
+#
+# MDEV-39541 mem_pressure::~mem_pressure() causes a crash on bootstrap
+#
 # restart
 select * from t1;
 a
 1
 2
 5
 drop table t1;
+# End of 10.11 tests

mysql-test/main/bootstrap_innodb.test

@@ -22,6 +22,18 @@ EOF
 exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --tmpdir=$MYSQL_TMP_DIR --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
 remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
 
+--echo #
+--echo # MDEV-39541 mem_pressure::~mem_pressure() causes a crash on bootstrap
+--echo #
+
+write_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
+SHUTDOWN;
+EOF
+exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --tmpdir=$MYSQL_TMP_DIR --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
+remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
+
 source include/start_mysqld.inc;
 select * from t1;
 drop table t1;
+
+--echo # End of 10.11 tests

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

@@ -2040,7 +2040,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
+@@ -22,7 +22,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

mysql-test/suite/backup/backup_innodb.result

@@ -0,0 +1,62 @@
+CREATE TABLE t(a INT PRIMARY KEY, b CHAR(255) DEFAULT '' NOT NULL, INDEX(b))
+ENGINE=INNODB;
+BEGIN;
+INSERT INTO t SET a=1;
+CREATE TABLE at1(i INTEGER) ENGINE=Aria TRANSACTIONAL=1;
+INSERT INTO at1 VALUES (2), (3), (5), (7);
+CREATE TABLE at0 (i INTEGER) ENGINE=Aria TRANSACTIONAL=0;
+INSERT INTO at0 VALUES (1), (1), (2), (3), (5);
+BACKUP SERVER TO '$target_directory';
+BACKUP SERVER TO '$target_directory' WITH '/bin/false';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'WITH '/bin/false'' at line 1
+BACKUP SERVER TO '$target_directory' WITH 4 CONCURRENT '/bin/false';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'WITH 4 CONCURRENT '/bin/false'' at line 1
+BACKUP SERVER WITH '/bin/false';
+ERROR HY000: IO Write error: (...) BACKUP SERVER
+BACKUP SERVER WITH 4 CONCURRENT '/bin/false';
+ERROR HY000: IO Write error: (...) BACKUP SERVER
+ROLLBACK;
+SELECT * FROM t;
+a	b
+1	
+BEGIN;
+DELETE FROM t;
+connect backup,localhost,root;
+BACKUP SERVER TO 'target_directory' 4 CONCURRENT;
+disconnect backup;
+connection default;
+ROLLBACK;
+SELECT * FROM t;
+a	b
+1	
+DELETE FROM t;
+DROP TABLE at0, at1;
+# 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
+SELECT * FROM at0;
+i
+1
+1
+2
+3
+5
+SELECT * FROM at1;
+i
+2
+3
+5
+7
+DROP TABLE t, at0, at1;
+ERROR HY000: Table 't' is read only
+SELECT * FROM at0;
+ERROR 42S02: Table 'test.at0' doesn't exist
+SELECT * FROM at1;
+ERROR 42S02: Table 'test.at1' doesn't exist
+# restart
+SELECT * FROM t;
+a	b
+DROP TABLE t;