Skip to content

MDEV-14296: Relocate wsrep_sst_common from /usr/bin to /usr/share/mariadb #4871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
FaramosCZ wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

MDEV-14296: Relocate wsrep_sst_common from /usr/bin to /usr/share/mariadb #4871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/mariadb-server.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ usr/bin/myisam_ftdump
usr/bin/myisamchk
usr/bin/myisamlog
usr/bin/myisampack
usr/bin/wsrep_sst_common
usr/bin/wsrep_sst_mariabackup
usr/bin/wsrep_sst_mysqldump
usr/bin/wsrep_sst_rsync
Expand Down Expand Up @@ -84,3 +83,4 @@ usr/share/man/man1/wsrep_sst_rsync_wan.1
usr/share/mariadb/mini-benchmark
usr/share/mariadb/wsrep.cnf
usr/share/mariadb/wsrep_notify
usr/share/mariadb/wsrep_sst_common
5 changes: 3 additions & 2 deletions scripts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,8 @@ ELSE()
wsrep_sst_backup
)
# The following script is sourced from other SST scripts, so it should
# not be made executable.
# not be made executable. Install it to the shared data directory
# rather than bindir, since it is a function library, not a command.
SET(WSREP_SOURCE
wsrep_sst_common
)
Expand All @@ -331,7 +332,7 @@ ELSE()
ENDIF()
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/${file}
DESTINATION ${INSTALL_BINDIR}
DESTINATION ${INSTALL_MYSQLSHAREDIR}
COMPONENT ${${file}_COMPONENT}
)
ENDFOREACH()
Expand Down
6 changes: 5 additions & 1 deletion scripts/wsrep_sst_backup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ set -ue

# This is a reference script for backup recovery state snapshot transfer.

. $(dirname "$0")/wsrep_sst_common
wsrep_sst_common_dir=$(dirname "$0")
if [ ! -f "$wsrep_sst_common_dir/wsrep_sst_common" ]; then
wsrep_sst_common_dir="@INSTALL_MYSQLSHAREDIRABS@"
fi
. "$wsrep_sst_common_dir/wsrep_sst_common"
Comment thread
FaramosCZ marked this conversation as resolved.

MAGIC_FILE="$DATA/backup_sst_complete"

Expand Down
6 changes: 5 additions & 1 deletion scripts/wsrep_sst_mariabackup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ set -ue
# https://mariadb.com/kb/en/mariabackup-overview/
# Make sure to read that before proceeding!

. $(dirname "$0")/wsrep_sst_common
wsrep_sst_common_dir=$(dirname "$0")
if [ ! -f "$wsrep_sst_common_dir/wsrep_sst_common" ]; then
wsrep_sst_common_dir="@INSTALL_MYSQLSHAREDIRABS@"
fi
. "$wsrep_sst_common_dir/wsrep_sst_common"

BACKUP_BIN=$(commandex 'mariadb-backup')
if [ -z "$BACKUP_BIN" ]; then
Expand Down
6 changes: 5 additions & 1 deletion scripts/wsrep_sst_mysqldump.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ set -ue

# This is a reference script for mariadb-dump-based state snapshot transfer.

. $(dirname "$0")/wsrep_sst_common
wsrep_sst_common_dir=$(dirname "$0")
if [ ! -f "$wsrep_sst_common_dir/wsrep_sst_common" ]; then
wsrep_sst_common_dir="@INSTALL_MYSQLSHAREDIRABS@"
fi
. "$wsrep_sst_common_dir/wsrep_sst_common"

CLIENT_DIR="$SCRIPTS_DIR/../client"

Expand Down
6 changes: 5 additions & 1 deletion scripts/wsrep_sst_rsync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ set -ue

# This is a reference script for rsync-based state snapshot transfer.

. $(dirname "$0")/wsrep_sst_common
wsrep_sst_common_dir=$(dirname "$0")
if [ ! -f "$wsrep_sst_common_dir/wsrep_sst_common" ]; then
wsrep_sst_common_dir="@INSTALL_MYSQLSHAREDIRABS@"
fi
. "$wsrep_sst_common_dir/wsrep_sst_common"

wsrep_check_programs rsync

Expand Down
2 changes: 1 addition & 1 deletion support-files/policy/apparmor/usr.sbin.mysqld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
/usr/bin/perl rix,
/usr/bin/seq rix,
/usr/bin/wsrep_sst* rix,
/usr/bin/wsrep_sst_common r,
/usr/bin/mariabackup* rix,
/usr/share/mariadb/wsrep_sst_common r,
/var/lib/mysql/ r,
/var/lib/mysql/** rw,
/var/lib/mysql/*.log w,
Expand Down
Loading