MDEV-39061 mariadb-backup compatible wrappers for BACKUP SERVER by Thirunarayanan · Pull Request #5140 · MariaDB/server

Thirunarayanan · 2026-05-28T09:52:21Z

scripts/mariabackup/mariabackup.sh: a drop-in wrapper that
lets existing mariabackup --backup invocations drive the server-side
BACKUP SERVER command without changing user scripts.

mariabackup.sh translates
--backup into "BACKUP SERVER TO '<dir>'" via the mariadb client,
forwarding connection options, and layers
--stream/--compress as tar/gzip pipelines on the result. It
validates the target directory up front and rejects the

- mbstream.sh shims the mbstream CLI onto tar, dropping
mbstream-only flags (-p/--parallel) so legacy pipelines keep working.
- README.md maps every supported --backup option to its BACKUP SERVER
equivalent and documents current limitations.

Add include/have_mariabackup_wrapper.inc redirects
$XTRABACKUP to the wrapper so a test opts in by sourcing one
file; skips when the wrapper, bash, or the mariadb client
is unavailable.

wrapper_basic.test : Exercises full backup, streaming, compression,
the ignored legacy options

CLAassistant · 2026-05-28T09:52:32Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

gemini-code-assist

Code Review

This pull request introduces server-side backup support (BACKUP SERVER) for MariaDB, implementing backup and log archiving mechanisms for both the InnoDB and Aria storage engines. It also includes a compatibility wrapper script (mariabackup.sh) to map legacy mariabackup CLI commands to the new server-side SQL interface. The code review identified several critical issues, including a potential server crash in backup_innodb.cc due to invalid format arguments in error reporting, null pointer dereferences and assertion failures in both engines when backup steps are executed out of order or fail to initialize, and security vulnerabilities (command injection) and argument parsing bugs in the shell wrapper script.

gemini-code-assist · 2026-05-28T09:57:26Z

+if [[ -n "$FINAL_INCLUDE" ]]; then
+    echo "Setting backup_include='$FINAL_INCLUDE'" >&2
+    mariadb $MARIADB_OPTS -e "SET GLOBAL backup_include='$FINAL_INCLUDE'"
+fi
+
+if [[ -n "$FINAL_EXCLUDE" ]]; then
+    echo "Setting backup_exclude='$FINAL_EXCLUDE'" >&2
+    mariadb $MARIADB_OPTS -e "SET GLOBAL backup_exclude='$FINAL_EXCLUDE'"
+fi
+
+# Execute BACKUP SERVER
+SQL="BACKUP SERVER TO '$TARGET_DIR'"
+echo "Executing: $SQL" >&2
+mariadb $MARIADB_OPTS -e "$SQL"


The parameters FINAL_INCLUDE, FINAL_EXCLUDE, and TARGET_DIR are interpolated into shell commands. To effectively prevent command injection, we should validate these inputs using a strict whitelist of allowed characters (such as alphanumeric characters and a limited set of safe symbols like '-', '_', '.') instead of relying on a blacklist or simple escaping.

Suggested change

if [[ -n "$FINAL_INCLUDE" ]]; then

echo "Setting backup_include='$FINAL_INCLUDE'" >&2

mariadb $MARIADB_OPTS -e "SET GLOBAL backup_include='$FINAL_INCLUDE'"

fi

if [[ -n "$FINAL_EXCLUDE" ]]; then

echo "Setting backup_exclude='$FINAL_EXCLUDE'" >&2

mariadb $MARIADB_OPTS -e "SET GLOBAL backup_exclude='$FINAL_EXCLUDE'"

fi

# Execute BACKUP SERVER

SQL="BACKUP SERVER TO '$TARGET_DIR'"

echo "Executing: $SQL" >&2

mariadb $MARIADB_OPTS -e "$SQL"

if [[ -n "$FINAL_INCLUDE" && ! "$FINAL_INCLUDE" =~ ^[a-zA-Z0-9_.-]+$ ]]; then

echo "Error: Invalid characters in FINAL_INCLUDE" >&2

exit 1

fi

References

When validating input that will be interpolated into shell commands, use a strict whitelist of allowed characters (e.g., alphanumeric and a limited set of safe symbols like '-', '_', '.') instead of a blacklist to effectively prevent command injection.

gemini-code-assist · 2026-05-28T09:57:26Z

+TABLES_PATTERN=""
+TABLES_EXCLUDE_PATTERN=""
+TABLES_FILE=""
+MARIADB_OPTS=""


Handling MARIADB_OPTS as a flat string will break if any option contains spaces or special characters (e.g., --password="my secret pass"). We should use a bash array instead.

Suggested change

MARIADB_OPTS=""

MARIADB_OPTS=()

gemini-code-assist · 2026-05-28T09:57:26Z

+        --user=*|--password=*|--host=*|--port=*|--socket=*)
+            # Connection options (long form) - pass through to mariadb client
+            MARIADB_OPTS="$MARIADB_OPTS $1"
+            shift
+            ;;
+        -u|-p|-h|-P|-S)
+            # Short form. If the next argv looks like a value (not another
+            # flag), consume it as well — supports both `-u USER` and bare
+            # `-p` (which mariadb client treats as a password prompt).
+            if [[ -n "${2-}" && "$2" != -* ]]; then
+                MARIADB_OPTS="$MARIADB_OPTS $1 $2"
+                shift 2
+            else
+                MARIADB_OPTS="$MARIADB_OPTS $1"
+                shift
+            fi
+            ;;
+        -u*|-p*|-h*|-P*|-S*)
+            # Bundled short form: -uUSER, -pSECRET, -hHOST, ...
+            MARIADB_OPTS="$MARIADB_OPTS $1"
+            shift
+            ;;
+        --defaults-file=*|--defaults-extra-file=*)
+            # Config file options - pass through to mariadb client
+            MARIADB_OPTS="$MARIADB_OPTS $1"
+            shift
+            ;;


We should append connection options to the MARIADB_OPTS array instead of concatenating them into a flat string to correctly handle arguments with spaces or special characters.

--user=*|--password=*|--host=*|--port=*|--socket=*) # Connection options (long form) - pass through to mariadb client MARIADB_OPTS+=("$1") shift ;; -u|-p|-h|-P|-S) # Short form. If the next argv looks like a value (not another # flag), consume it as well — supports both `-u USER` and bare # `-p` (which mariadb client treats as a password prompt). if [[ -n "${2-}" && "$2" != -* ]]; then MARIADB_OPTS+=("$1" "$2") shift 2 else MARIADB_OPTS+=("$1") shift fi ;; -u*|-p*|-h*|-P*|-S*) # Bundled short form: -uUSER, -pSECRET, -hHOST, ... MARIADB_OPTS+=("$1") shift ;; --defaults-file=*|--defaults-extra-file=*) # Config file options - pass through to mariadb client MARIADB_OPTS+=("$1") shift ;;

gemini-code-assist · 2026-05-28T09:57:26Z

+  }
+
+#ifndef _WIN32
+  int dir= open(target.str, O_DIRECTORY);


To be fully standard and portable, open with O_DIRECTORY should explicitly include the access mode O_RDONLY.

Suggested change

int dir= open(target.str, O_DIRECTORY);

int dir= open(target.str, O_RDONLY | O_DIRECTORY);

gemini-code-assist · 2026-05-28T09:57:26Z

+    explicit Aria_backup(THD *thd, Target target) noexcept
+    : target(target)
+#ifndef _WIN32
+    , datadir_fd(open(maria_data_root, O_DIRECTORY))


To be fully standard and portable, open with O_DIRECTORY should explicitly include the access mode O_RDONLY.

, datadir_fd(open(maria_data_root, O_RDONLY | O_DIRECTORY))

grooverdan · 2026-05-29T05:50:51Z

Hey @Thirunarayanan , have you thought of how this is going to end up in packaging? It is replacing the original mariadb-backup?

It needs some INSTALL/INSTALL_SCRIPT cmake directives around this to give it a install location and a cmake component. debian installation/packaging would need the relevant debian/{package}.install to include te script.

dr-m

Please rebase this on the current branch.

dr-m · 2026-06-08T09:50:42Z

@@ -0,0 +1,82 @@
+--source include/have_mariabackup_wrapper.inc


Can this be implemented in a way that is compatible with the .combinations logic?

I would like most of --suite=mariabackup to be run both with the genuine mariadb-backup and with the BACKUP SERVER based wrapper scripts. Currently, this is the only test that exercises the wrappers, and it fails to test the original executables to demonstrate compatibility between them and the wrappers.

dr-m · 2026-06-08T09:54:17Z

+--echo #
+--echo # --stream=mbstream emits a valid tar archive to stdout
+--echo #
+--let $targetdir=$MYSQLTEST_VARDIR/tmp/bk_stream
+--let $streamfile=$MYSQLTEST_VARDIR/tmp/bk_stream.tar
+--exec $XTRABACKUP $defaults --backup --target-dir=$targetdir --stream=mbstream > $streamfile 2>$logfile
+--exec tar -tf $streamfile > /dev/null
+--let SEARCH_PATTERN=Creating tar stream
+--source include/search_pattern_in_file.inc
+--rmdir $targetdir
+--remove_file $streamfile


I’m not sure if this should be in the current scope. We don’t have any MDEV-38362 streaming backup yet. What should be more in the scope is demonstrating that the mbstream wrapper script is syntactically compatible with its namesake utility.

dr-m · 2026-06-08T09:57:16Z

@@ -0,0 +1,19 @@
+#!/bin/bash


Can we write this for the POSIX shell? Bourne Again Shell (bash) is not available in all environments, for good reasons: reduced resource usage as well as attack surface; remember https://en.wikipedia.org/wiki/Shellshock_(software_bug)

dr-m · 2026-06-08T10:09:00Z

+        -p|--parallel)
+            SKIP_NEXT=1
+            ;;
+        -p*)
+            ;;
+        --parallel=*)
+            ;;


These are necessary but not sufficient rules. mbstream -xp4 would be a valid invocation of the original utility (equivalent to -x -p4), but not of GNU tar.

I did test that mbstream indeed treats anything after -p as a single argument. For example, -p4t and -p4x would report the following, respectively:

Warning: option 'parallel': signed value 4398046511104 adjusted to 2147483647 Unknown suffix 'x' used for variable 'parallel' (value '4x'). Legal suffix characters are: K, M, G, T, P, E mbstream: Error while setting value '4x' to 'parallel'

Please add a test file that covers both the real mbstream and this wrapper. Both with some invalid and valid invocation. For example, mbstream -t is not allowed, while tar -t is.

dr-m · 2026-06-11T12:05:20Z

+        --parallel=*|--throttle=*|--no-lock|--safe-slave-backup)
+            # Handled server-side by BACKUP SERVER.
+            shift ;;


The --parallel option will have to be passed through to non-streaming backup.

8077134 in #4817 implements multi-threaded backup to a mounted file system. By default, only 1 thread will be used.

For streaming backup (which is not implemented yet except as stubs), I think that we must limit the backup to a single thread, because unlike the old xbstream or mbstream format, BACKUP SERVER will generate one stream per thread. So, the only way to end up with one backup stream is to use a single thread.

dr-m

Now that #4817 includes support for streaming (see the test backup.backup_stream, which passes on Linux, FreeBSD, Microsoft Windows and Apple macOS), it would be good to add support for streaming backup.

When I tested the merge of this to the current #4817, I got one test failure:

CURRENT_TEST: mariabackup.wrapper_basic
NOT FOUND /Executing: BACKUP SERVER TO/ in wrapper.log
mysqltest: In included file "./include/search_pattern_in_file.inc": 
included from /mariadb/main/mysql-test/suite/mariabackup/wrapper_basic.test at line 19:
At line 65: command "perl" failed with error: 255  my_errno: 0  errno: 0

I couldn’t figure this out. At the very end of scripts/mariabackup/mariabackup.sh we are writing a configuration file, and that is what happens. I even added set -eux or set -eu to the start of the script, and it did not complain about any uninitialized variables. I think that set -eu would be a good safety measure.

Note: I am going to squash #4817 shortly.

dr-m · 2026-06-25T12:43:56Z

+if ($errno)
+{
+  --skip mariabackup.sh wrapper unavailable (script or sh missing)
+}


/bin/sh can’t possibly be missing on a POSIX system; it is what system(3), popen(3) and friends will invoke.

dr-m · 2026-06-25T12:46:13Z

+#
+#   $XTRABACKUP        — now points at mariabackup.sh
+
+--source include/linux.inc


I think we only want to exclude non-POSIX environments, more specifically, Microsoft Windows. For that, I would suggest the following:

--source include/not_windows.inc

or if it cannot be used for some reason:

if ($MARIADB_UPGRADE_EXE) { --skip Need POSIX }

The following SQL statements will be introduced: BACKUP SERVER TO '/path/to/directory' [ 1 CONCURRENT ]; BACKUP SERVER WITH [ 1 CONCURRENT ] 'command'; In place of the 1, any positive number of threads may be specified. For the first variant, '/path/to' must exist and '/path/to/directory' must not exist; that is where the backup will be written to. For the second variant, 'command' must be the name of a script or command that will be executed in a child process. The standard input of that command will be in a format that is compatible with GNU tar --format=oldgnu (and also BSD tar variants that are also part of Microsoft Windows and Apple macOS). The command is expected to optionally compress and encrypt the stream and redirect it to a file on a local or a remote server. The BACKUP SERVER WITH will append an additional argument, a positive base-ten number in ASCII, starting with 1, to identify the current thread. In this way, each concurrent stream can write a separate file. The backup or the first stream will contain a file backup.cnf, which includes parameters needed for restoring the backup. Currently, these are innodb_log_recovery_start and innodb_log_recovery_target. If innodb_log_recovery_target>0, InnoDB will be in read-only mode, not allowing any writes to persistent files other than via the log application. To restore a streaming backup made with BACKUP SERVER WITH, an empty directory needs to be created and all streams be extracted there using the standard tar utility of the operating system, optionally after undoing any encryption or compression that had been added by the backup command. Then, the backup is prepared or MariaDB server started up on the extracted directory, similar to as if the BACKUP SERVER TO statement had been used. Note: The parameter innodb_log_recovery_start in backup.cnf is STRICTLY NECESSARY TO AVOID CORRUPTION! By default, InnoDB crash recovery starts from the latest available log checkpoint. However, for restoring a backup, recovery must start from the checkpoint that was the latest when the backup was started. Starting recovery from a possible later checkpoint will result in a corrupted database! The following will be implemented separately: MDEV-39061 mariadb-backup compatible wrapper script for BACKUP SERVER MDEV-40163 Partial backup and restore MDEV-39091 Back up ENGINE=RocksDB MDEV-39092 Less blocking backup of ENGINE=Aria The implementation introduces a basic driver Sql_cmd_backup, storage engine interfaces, and basic copying of the storage engines InnoDB, Aria, MyISAM, MERGE (MyISAM), Archive, CSV. backup_target: A structured data type to represent a target directory. On Microsoft Windows, we must use directory paths because there is no variant of CopyFileEx() that would work on file handles. backup_sink: Wraps a per-thread output stream as well as storage engine specific context. handlerton::backup_start(), handlerton::backup_end(): Invoked at the start or end of a backup phase, in the thread that executes a BACKUP SERVER statement. handlerton::backup_step(): A backup step that can be invoked from multiple threads concurrently, between the execution of the corresponding handlerton::backup_start() and handlerton::backup_end() of the same phase. copy_entire_file(): A file copying service for POSIX systems. copy_file(): A partial or sparse file-copying service for all systems. backup_stream_append(): Equivalent to copy_file(), but appending to a stream. On Linux, this uses sendfile(2), which assumes that the source data will not be changed before the data has been consumed from the pipe. backup_stream_append_async(): A variant of backup_stream_append() where the source file region is guaranteed to be immutable after the call returns. We must not use Linux sendfile(2) for copying data files that may be modified in place, because it could introduce a race condition between a page write that runs concurrently with a child process that is reading the data from the pipe. InnoDB_backup::context: Backup context, attached to backup_sink so that context can continue to exist between the time a BACKUP SERVER releases all locks and another BACKUP SERVER starts executing, with innodb_backup pointing to the new backup, while the old backup is still being finished. fil_space_t::write_or_backup: Keep track of in-flight page writes and pending backup operation. We must not allow them concurrently, because that could lead into torn pages in the backup. fil_space_t::backup_end: The first page number that is not being backed up (by default 0, to indicate that no backup is in progress). fil_space_t::BACKUP_BATCH_SIZE: The number of preceding pages that will be covered by fil_space_t::backup_end. This is the unit of "page range locking" during InnoDB backup. log_sys.backup: Whether BACKUP SERVER is in progress. The purpose of this is to make BACKUP SERVER prevent the concurrent execution of SET GLOBAL innodb_log_archive=OFF or SET GLOBAL innodb_log_file_size when innodb_log_archive=OFF. log_sys.archived_checkpoint: Keep track of the earliest available checkpoint, corresponding to log_sys.archived_lsn. This reflects SET GLOBAL innodb_log_recovery_start (which is settable now), for incremental backup. buf_flush_list_space(): Check for concurrent backup before writing each page. This is inefficient, but this function may be invoked from multiple threads concurrently, and it cannot be changed easily, especially for fil_crypt_thread(). fil_system.have_all_spaces: Whether all tablespace metadata is guaranteed to be known. To speed up startup, InnoDB does not normally open all tablespace files.

dr-m

Here are some initial comments. I did not check the mariabackup.sh in detail, but I think that this is a very good start.

dr-m · 2026-06-29T12:00:37Z

+########################################################################
+# 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)


scripts/mariabackup/CMakeLists.txt would be a less surprising place for this. Would it work? If not, then I would suggest moving scripts/mariabackup to extra/mariabackup/scripts.

dr-m · 2026-06-29T12:06:51Z

+    -v|--verbose)            ;;
+
+    --)                      shift; break ;;
+    -*)                      ;;


Shouldn’t we throw an error for any unknown option? For example, -b 1 works in GNU tar, but certainly not in mbstream.

dr-m · 2026-06-29T12:09:42Z

+    # The wrapper streams several tar archives
+    # back to back (one per stream, plus backup-prepare.cnf),
+    # so --ignore-zeros is required to extract them all rather
+    # than stopping at the first archive's end-of-file marker.
+    x) exec tar --ignore-zeros -x -f - -C "$dir" ;;


We are not currently adding any NUL block at the end of each stream, so the GNU tar specific option --ignore-zeros should not be needed. If you install libarchive-tools, you should get a bsdtar that is compatible with the tar.exe that is shipped with Microsoft Windows. That executable does not recognize an --ignore-zeros option.

I think that we should try to make this script compatible also with BSD tar.

dr-m · 2026-06-29T12:16:45Z

+    if [ -n "$_enc" ]; then
+        echo "plugin-load-add=$_enc"


Two tests would fail unless we extend this with a patch that you shared with me:

_plugin_dir=$(ask "SELECT @@global.plugin_dir") [ -n "$_plugin_dir" ] && echo "plugin-dir=$_plugin_dir"

dr-m · 2026-06-29T12:19:29Z

+esac
+# Where "rr record" stores traces, so we can point at it on a crash.
+rr_trace_dir=${_RR_TRACE_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/rr}
+


Do we really want it this complicated, or could we do the following:

: ${MARIADBD=mariadbd}

Then, to have the invoked server run under rr record, one would execute (for example)

_RR_TRACE_DIR=/dev/shm/rr MARIADBD='rr record -h` mariabackup.sh

Also, should we rather call this script mariadb-backup-server? The name mariabackup was deprecated and replaced with mariadb-backup some years ago.

Observe aria_log_dir_path Patch based on code by Thirunarayanan Balathandayuthapani

This adds a shell script that lets users keep using their existing mariadb-backup commands while the real work is done by the new server-side BACKUP SERVER command. The goal is "drop-in": users should not have to change their backup scripts. extra/mariabackup/scripts/mariadb-backup-server.sh (plain POSIX sh) understands the usual mariadb-backup modes and translates each one. A companion helper, extra/mariabackup/scripts/mbstream-server.sh, lets streamed backups be unpacked by pipelines that expect the mbstream CLI. Both are documented in extra/mariabackup/scripts/README.md. --backup ======== Connects with the mariadb client and runs "BACKUP SERVER TO '<dir>'". Connection options (--user, --host, --port, --socket, --defaults-file, ssl, ...) are passed through to the client; --parallel=N becomes the "<N> CONCURRENT" clause. After the backup it writes backup-prepare.cnf into the backup directory, recording what --prepare needs later: where mariadbd lives, the InnoDB parameters (page size, data file path, undo tablespaces, checksum algorithm, log file size), and if the server is encrypted then how to reload the encryption key plugin (the file_key_management variables), so an encrypted backup can be prepared without extra input. --backup --stream ================= Runs "BACKUP SERVER WITH [N CONCURRENT] '<command>'": the server feeds each stream's tar to <command>, the wrapper collects the parts, writes them to stdout, then appends backup-prepare.cnf as a final tar. The per-stream tars carry no end-of-archive marker; only the trailing backup-prepare.cnf adds the single end marker, so the whole stream extracts with a plain "tar -x". Two properties follow from how BACKUP SERVER streams, both differing from mariadb-backup: - local: the stream command runs inside the server, so the wrapper must share its filesystem; - tar only: any --stream=<format> (including xbstream) yields tar. --target-dir is optional in stream mode (scratch for the per-stream parts; a mktemp dir is used otherwise). mbstream-server.sh maps the mbstream CLI onto a plain "tar -x"/"tar -c", so existing "mbstream -x"/"-c" pipelines keep working on the wrapper's stream. mbstream-only flags (-p/--parallel, ...) are accepted and ignored; any other unknown option is rejected. Environment overrides (mainly for testing): MARIADB (client), MARIADBD (the --prepare bootstrap server) and TAR (the tar implementation, e.g. TAR=bsdtar) can each be overridden. To run the bootstrap under rr, put it in MARIADBD and let rr's own _RR_TRACE_DIR choose the trace location, e.g. _RR_TRACE_DIR=/dev/shm/rr MARIADBD='rr record mariadbd' --prepare ========= Starts "mariadbd --bootstrap" on the backup directory using backup-prepare.cnf as its defaults file, replays the archived redo log between the start and target LSN read from backup.cnf, then builds a fresh ib_logfile0 so a normal server can start on the directory. mariadbd is taken from the path recorded in backup-prepare.cnf if that binary exists, otherwise from PATH. User --defaults-file/-extra-file and encryption options are layered onto the bootstrap. --copy-back / --move-back ========================= Copy or move a prepared backup into the datadir. The datadir is created if missing, a non-empty datadir is refused unless --force-non-empty-directories is given, and a chown reminder is printed. If --aria-log-dir-path is given, the Aria logs (aria_log_control, aria_log.*) are relocated into that directory. Packaging ========= The wrapper is not installed by default and never replaces the real mariadb-backup / mbstream binaries. 1. cmake -DWITH_MARIABACKUP_WRAPPER=ON (default OFF) controls it. 2. When ON, the scripts install as /usr/bin/mariadb-backup-server and /usr/bin/mbstream-server, tagged COMPONENT Backup so they ship in the mariadb-backup package. 3. RPM: nothing extra to do. the component handles it. 4. DEB: not wired. debian/rules uses --fail-missing and does not enable the option, so the -server binaries are not listed. To ship via DEB, make a paired change: add -DWITH_MARIABACKUP_WRAPPER=ON in debian/rules and list both usr/bin/mariadb-backup-server and usr/bin/mbstream-server in debian/mariadb-backup.install together. 5. The real mariadb-backup/mbstream binaries and the mariabackup symlink are left untouched; opt in via an alias or a symlink early in PATH. Limitations (not supported yet) =============================== 1) Incremental backup & prepare (--incremental-basedir, --incremental-dir, --apply-log-only) 2) --rollback-xa 3) Partial backup (--databases, --tables, --tables-file) 4) Output compression and encryption (--compress, --encrypt) 5) --export is accepted but only warns and runs a plain recovery 6) --extra-lsndir is ignored 7) Windows: POSIX sh only, not installed on Windows Behaviour differences from native mariadb-backup ================================================ - The wrapper needs the mariadb client on PATH for --backup, and mariadbd on PATH (or recorded in backup-prepare.cnf) for --prepare - BACKUP SERVER refuses an already-existing target directory - BACKUP SERVER does copy the data file as raw pages without checksum validation, so a corrupted table is not detected at backup time - --prepare only works on a wrapper-made backup. It needs backup-prepare.cnf) - --stream is tar, not xbstream, and local-only Tests ===== include/have_mariabackup_wrapper.inc redirects $XTRABACKUP to mariadb-backup-server.sh and $XBSTREAM to mbstream-server.sh, skipping when a wrapper or the mariadb client is unavailable. include/have_mariabackup_combination.inc runs a test under both the [CLIENT] mariadb-backup binary and the [SERVER] wrapper.

dr-m · 2026-06-30T12:06:42Z

 # Write more than 2MiB of FILE_MODIFY mini-transactions to exercise the parser.
 my $extra = pack("CCxa*", 0xb9, 127, "a/b.ibd");
 $extra .= pack("CN", 0, mycrc32($extra, 0, $polynomial));


As you can see here, the mariabackup.huge_lsn,strict_full_crc32 combinations are writing some normally impossible log records. The SERVER variant (having the wrapper script invoke BACKUP SERVER) would hang on many targets because log_t::set_archive() is waiting for a checkpoint, but apparently the buf_flush_page_cleaner() thread has nothing to do because the buf_pool.flush_list is apparently empty; the log buffer is filled solely with FILE_ records and no page-level records, like it normally would be the case.

I am unable to reproduce this hang locally, but it does occur on many platforms. I will apply the following patch to #4817, which I think should fix this hang:

diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index aa2063719d8..c313b3d9b51 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -810,7 +810,7 @@ bool log_t::set_archive(my_bool archive, THD *thd, bool backup) noexcept if (wait_lsn) { mysql_mutex_lock(&buf_pool.flush_list_mutex); - buf_flush_wait(wait_lsn, false); + buf_flush_wait(wait_lsn, !UT_LIST_GET_LEN(buf_pool.flush_list)); mysql_mutex_unlock(&buf_pool.flush_list_mutex); } latch.wr_unlock();

This was applied to 9e27d73, which you should rebase on.

dr-m

I think that this is good enough for a first step. I only have some minor commments. More may be found by testing.

dr-m · 2026-06-30T12:57:42Z

+# To run the prepare bootstrap under rr, include it in MARIADBD
+# (rr's own _RR_TRACE_DIR controls where the trace is written).
+# e.g.  _RR_TRACE_DIR=/dev/shm/rr MARIADBD='rr record mariadbd' ...
+: "${MARIADB:=mariadb}"
+: "${TAR:=tar}"


Do we need to mention a tool here that is not likely to work for end users, at least until the instrumentation of the copy_file_range system call has been fixed?

Why is the mariadbd executable not wrapped in the same way?

dr-m · 2026-06-30T13:00:57Z

+# The wrapped commands can be overridden for testing, e.g.
+#   MARIADB='mariadb --protocol=tcp', TAR=bsdtar.


I’d suggest to omit the , after MARIADB= and the . after TAR= because literally copying the line to the start of a shell command should result in --protocol=tcp, which I assume is not going to work. Maybe, in a preceding line, say that the environment variables can be overridden at the start of a shell command, or give more complete examples:

# MARIADB='mariadb --protocol=tcp' TAR=bsdtar mariadb-backup-server.sh --backup ... # TAR=bsdtar mariadb-backup-server.sh --prepare ...

dr-m · 2026-06-30T13:03:10Z

+# In stream mode --target-dir is optional:
+# it is only a scratch directory for the per-stream tar parts
+# (a mktemp dir is used when it is omitted).
+[ -n "$STREAM" ] || [ -n "$TARGET_DIR" ] || die "--target-dir required"


Here and elsewhere, we are invoking the external command [ a.k.a. test multiple times. That command does support logical -a and -o. We should use them. man 1 test to learn the syntax.

dr-m · 2026-06-30T13:31:10Z

@@ -1,3 +1,4 @@
+--source include/have_mariabackup_combination.inc


We have the SERVER variant of this test failing on FreeBSD:

mariabackup.full_backup '32k,SERVER' w6 [ fail ] Test ended at 2026-06-30 01:54:32 CURRENT_TEST: mariabackup.full_backup mysqltest: At line 39: exec of '/data/buildbot/workers/prod/amd64-freebsd-14/build/mysql-test/../extra/mariabackup/scripts/mariadb-backup-server.sh --prepare --target-dir=/data/buildbot/workers/prod/amd64-freebsd-14/build/mysql-test/var/6/tmp/backup 2>&1' failed, error: 256, status: 1, errno: 22 Output from before failure: /data/buildbot/workers/prod/amd64-freebsd-14/build/mysql-test/../extra/mariabackup/scripts/mariadb-backup-server.sh: mariadbd: not found

Thirunarayanan requested a review from dr-m May 28, 2026 09:52

Thirunarayanan added the MariaDB Corporation label May 28, 2026

gemini-code-assist Bot reviewed May 28, 2026

View reviewed changes

dr-m force-pushed the MDEV-14992 branch from d595ce0 to c0e48fc Compare May 29, 2026 14:17

Thirunarayanan force-pushed the MDEV-39061 branch from 8d0dc79 to 051f681 Compare June 2, 2026 14:34

dr-m force-pushed the MDEV-14992 branch from b98be03 to 10539aa Compare June 8, 2026 09:35

dr-m reviewed Jun 8, 2026

View reviewed changes

Thirunarayanan force-pushed the MDEV-39061 branch from 051f681 to 6e37d3a Compare June 8, 2026 10:33

dr-m reviewed Jun 11, 2026

View reviewed changes

Thirunarayanan force-pushed the MDEV-39061 branch from 6e37d3a to 3427e04 Compare June 17, 2026 12:47

dr-m force-pushed the MDEV-14992 branch from e81af7f to 6c8a37f Compare June 18, 2026 09:59

Thirunarayanan force-pushed the MDEV-39061 branch 2 times, most recently from 9ce9751 to 1fcb44e Compare June 23, 2026 11:24

dr-m reviewed Jun 25, 2026

View reviewed changes

dr-m force-pushed the MDEV-14992 branch 2 times, most recently from 87036f8 to 4769a43 Compare June 25, 2026 13:18

dr-m mentioned this pull request Jun 26, 2026

MDEV-14992 BACKUP SERVER #4817

Open

Thirunarayanan force-pushed the MDEV-39061 branch from 86c9bc3 to b99a766 Compare June 29, 2026 07:17

dr-m force-pushed the MDEV-14992 branch from a7570c4 to 81b3ae7 Compare June 29, 2026 08:23

Thirunarayanan force-pushed the MDEV-39061 branch from b99a766 to cee7cfc Compare June 29, 2026 10:27

fixup! 81b3ae7

49f4a3e

dr-m reviewed Jun 29, 2026

View reviewed changes

squash! 81b3ae7

6c59b14

Observe aria_log_dir_path Patch based on code by Thirunarayanan Balathandayuthapani

Thirunarayanan force-pushed the MDEV-39061 branch from cee7cfc to fee9458 Compare June 29, 2026 18:21

Thirunarayanan force-pushed the MDEV-39061 branch from fee9458 to ac4c513 Compare June 29, 2026 18:40

dr-m reviewed Jun 30, 2026

View reviewed changes

dr-m force-pushed the MDEV-14992 branch 2 times, most recently from 9e27d73 to 5235e7a Compare June 30, 2026 12:43

dr-m approved these changes Jun 30, 2026

View reviewed changes

dr-m reviewed Jun 30, 2026

View reviewed changes

	int dir= open(target.str, O_DIRECTORY);
	int dir= open(target.str, O_RDONLY \| O_DIRECTORY);

		@@ -0,0 +1,82 @@
		--source include/have_mariabackup_wrapper.inc

		# The wrapped commands can be overridden for testing, e.g.
		# MARIADB='mariadb --protocol=tcp', TAR=bsdtar.

		@@ -1,3 +1,4 @@
		--source include/have_mariabackup_combination.inc

Uh oh!

Uh oh!

Conversation

Thirunarayanan commented May 28, 2026

Uh oh!

CLAassistant commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gemini-code-assist Bot May 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot May 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot May 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot May 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot May 28, 2026

Choose a reason for hiding this comment

Uh oh!

grooverdan commented May 29, 2026

Uh oh!

dr-m left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dr-m left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dr-m left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dr-m left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

CLAassistant commented May 28, 2026 •

edited

Loading