Skip to content

Commit

Permalink
MDEV-32515 Use $MYSQLD_LAST_CMD in spider/bugfix.mdev_30370
Browse files Browse the repository at this point in the history
$MYSQLD_CMD uses .1 as the defaults-group-suffix, which could cause
the use of the default port (3306) or socket, which will fail in
environment where these defaults are already in use by another server.

Adding an extra --defaults-group-suffix=.1.1 does not help, because
the first flag wins.

So we use $MYSQLD_LAST_CMD instead, which uses the correct suffix.

The extra innodb buffer pool warning is irrelevant to the goal of the
test (running --wsrep-recover with --plug-load-add=ha_spider should
not cause hang)
  • Loading branch information
mariadb-YuchenPei committed Dec 7, 2023
1 parent d8f5d2b commit 70283ac
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
@@ -1,6 +1,7 @@
#
# MDEV-30370 mariadbd hangs when running with --wsrep-recover and --plugin-load-add=ha_spider.so
#
call mtr.add_suppression(".*\\[Warning\\] InnoDB: Skipping buffer pool dump/restore during wsrep recovery");
# Kill the server
# restart
Warnings:
Expand Down
5 changes: 2 additions & 3 deletions storage/spider/mysql-test/spider/bugfix/t/mdev_30370.test
Expand Up @@ -3,10 +3,9 @@
--echo # MDEV-30370 mariadbd hangs when running with --wsrep-recover and --plugin-load-add=ha_spider.so
--echo #

let $MYSQLD_DATADIR= `select @@datadir`;
let $PLUGIN_DIR=`select @@plugin_dir`;
call mtr.add_suppression(".*\\[Warning\\] InnoDB: Skipping buffer pool dump/restore during wsrep recovery");
--source include/kill_mysqld.inc
--exec $MYSQLD_CMD --datadir=$MYSQLD_DATADIR --wsrep-recover --plugin-dir=$PLUGIN_DIR --plugin-load-add=ha_spider
--exec $MYSQLD_LAST_CMD --wsrep-recover --plugin-load-add=ha_spider
--source include/start_mysqld.inc
--disable_query_log
--source ../../include/clean_up_spider.inc

0 comments on commit 70283ac

Please sign in to comment.