Skip to content
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

Release 2024q4 part 1 #618

Merged
merged 11 commits into from
Nov 4, 2024
+129 −3,922
Merged

Release 2024q4 part 1 #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c822f0e
partial revert on 0cb4378923cfd862525b12cc86db87e7917a55e3 (releaseSt…
grooverdan Aug 15, 2024
10fd9eb
revert b34b76eb883ea262db762517947e2cb2776f112b version fix
grooverdan Aug 15, 2024
0d5a14e
Merge branch 'master' into next
grooverdan Sep 3, 2024
97c2acc
test: break config file
grooverdan Sep 3, 2024
afb3ee5
11.1 EOL
grooverdan Sep 3, 2024
615f812
main: 11.7 currently
grooverdan Sep 16, 2024
5947241
MDEV-34943 Disable replication start on initialization
grooverdan Sep 4, 2024
d556174
healthcheck.sh add --no-connect option
grooverdan Sep 17, 2024
e50c40e
Replication fix - updates for 11.6
grooverdan Sep 19, 2024
9e9da8e
11.5 EOL
grooverdan Sep 19, 2024
9824707
update.sh - handle trailing / in path
grooverdan Nov 3, 2024
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
6 changes: 4 additions & 2 deletions .test/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,12 +961,14 @@ zstd "${initdb}"/*zst*
# ERROR 1045 (28000): Access denied
docker exec "$cname" healthcheck.sh --connect


# break port
docker exec "$cname" sed -i -e 's/\(port=\)/\14/' /var/lib/mysql/.my-healthcheck.cnf

docker exec "$cname" healthcheck.sh --connect || echo "ok, broken port is a connection failure"

# break config file
docker exec "$cname" sed -i -e 's/-client]$//' /var/lib/mysql/.my-healthcheck.cnf
docker exec "$cname" healthcheck.sh --connect || echo "ok, broken config file is a failure"

killoff

docker volume rm "$tmpvol"
Expand Down
10 changes: 3 additions & 7 deletions 10.11-ubi/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ mysql_get_config() {
docker_temp_server_start() {
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
--expire-logs-days=0 \
--skip-slave-start \
--loose-innodb_buffer_pool_load_at_startup=0 \
&
declare -g MARIADB_PID
Expand Down Expand Up @@ -458,7 +459,6 @@ docker_setup_db() {
# To create replica user
local createReplicaUser=
local changeMasterTo=
local startReplica=
if [ -n "$MARIADB_REPLICATION_USER" ] ; then
if [ -z "$MARIADB_MASTER_HOST" ]; then
# on master
Expand All @@ -471,7 +471,6 @@ docker_setup_db() {
# SC cannot follow how MARIADB_MASTER_PORT is assigned a default value.
# shellcheck disable=SC2153
changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;"
startReplica="START REPLICA;"
fi
fi

Expand Down Expand Up @@ -502,7 +501,6 @@ docker_setup_db() {
${userGrants}

${changeMasterTo}
${startReplica}
EOSQL
}

Expand Down Expand Up @@ -598,8 +596,7 @@ docker_mariadb_upgrade() {
fi
mysql_note "Starting temporary server"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
mysql_note "Temporary server started."

docker_mariadb_backup_system
Expand All @@ -624,8 +621,7 @@ EOSQL
# need a restart as FLUSH PRIVILEGES isn't reversable
mysql_note "Restarting temporary server for upgrade"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
else
return 0
fi
Expand Down
5 changes: 5 additions & 0 deletions 10.11-ubi/healthcheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,11 @@ while [ $# -gt 0 ]; do
fi
nodefaults=
;;
--no-connect)
# used for /docker-entrypoint-initdb.d scripts
# where you definately don't want a connection test
connect_s=0
;;
--*)
test=${1#--}
;;
Expand Down
10 changes: 3 additions & 7 deletions 10.11/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ mysql_get_config() {
docker_temp_server_start() {
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
--expire-logs-days=0 \
--skip-slave-start \
--loose-innodb_buffer_pool_load_at_startup=0 \
&
declare -g MARIADB_PID
Expand Down Expand Up @@ -458,7 +459,6 @@ docker_setup_db() {
# To create replica user
local createReplicaUser=
local changeMasterTo=
local startReplica=
if [ -n "$MARIADB_REPLICATION_USER" ] ; then
if [ -z "$MARIADB_MASTER_HOST" ]; then
# on master
Expand All @@ -471,7 +471,6 @@ docker_setup_db() {
# SC cannot follow how MARIADB_MASTER_PORT is assigned a default value.
# shellcheck disable=SC2153
changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;"
startReplica="START REPLICA;"
fi
fi

Expand Down Expand Up @@ -502,7 +501,6 @@ docker_setup_db() {
${userGrants}

${changeMasterTo}
${startReplica}
EOSQL
}

Expand Down Expand Up @@ -598,8 +596,7 @@ docker_mariadb_upgrade() {
fi
mysql_note "Starting temporary server"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
mysql_note "Temporary server started."

docker_mariadb_backup_system
Expand All @@ -624,8 +621,7 @@ EOSQL
# need a restart as FLUSH PRIVILEGES isn't reversable
mysql_note "Restarting temporary server for upgrade"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
else
return 0
fi
Expand Down
5 changes: 5 additions & 0 deletions 10.11/healthcheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,11 @@ while [ $# -gt 0 ]; do
fi
nodefaults=
;;
--no-connect)
# used for /docker-entrypoint-initdb.d scripts
# where you definately don't want a connection test
connect_s=0
;;
--*)
test=${1#--}
;;
Expand Down
10 changes: 3 additions & 7 deletions 10.5/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ mysql_get_config() {
docker_temp_server_start() {
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
--expire-logs-days=0 \
--skip-slave-start \
--loose-innodb_buffer_pool_load_at_startup=0 \
&
declare -g MARIADB_PID
Expand Down Expand Up @@ -449,7 +450,6 @@ docker_setup_db() {
# To create replica user
local createReplicaUser=
local changeMasterTo=
local startReplica=
if [ -n "$MARIADB_REPLICATION_USER" ] ; then
if [ -z "$MARIADB_MASTER_HOST" ]; then
# on master
Expand All @@ -462,7 +462,6 @@ docker_setup_db() {
# SC cannot follow how MARIADB_MASTER_PORT is assigned a default value.
# shellcheck disable=SC2153
changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;"
startReplica="START REPLICA;"
fi
fi

Expand Down Expand Up @@ -493,7 +492,6 @@ docker_setup_db() {
${userGrants}

${changeMasterTo}
${startReplica}
EOSQL
}

Expand Down Expand Up @@ -589,8 +587,7 @@ docker_mariadb_upgrade() {
fi
mysql_note "Starting temporary server"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
mysql_note "Temporary server started."

docker_mariadb_backup_system
Expand All @@ -615,8 +612,7 @@ EOSQL
# need a restart as FLUSH PRIVILEGES isn't reversable
mysql_note "Restarting temporary server for upgrade"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
else
return 0
fi
Expand Down
5 changes: 5 additions & 0 deletions 10.5/healthcheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,11 @@ while [ $# -gt 0 ]; do
fi
nodefaults=
;;
--no-connect)
# used for /docker-entrypoint-initdb.d scripts
# where you definately don't want a connection test
connect_s=0
;;
--*)
test=${1#--}
;;
Expand Down
10 changes: 3 additions & 7 deletions 10.6-ubi/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ mysql_get_config() {
docker_temp_server_start() {
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
--expire-logs-days=0 \
--skip-slave-start \
--loose-innodb_buffer_pool_load_at_startup=0 \
&
declare -g MARIADB_PID
Expand Down Expand Up @@ -450,7 +451,6 @@ docker_setup_db() {
# To create replica user
local createReplicaUser=
local changeMasterTo=
local startReplica=
if [ -n "$MARIADB_REPLICATION_USER" ] ; then
if [ -z "$MARIADB_MASTER_HOST" ]; then
# on master
Expand All @@ -463,7 +463,6 @@ docker_setup_db() {
# SC cannot follow how MARIADB_MASTER_PORT is assigned a default value.
# shellcheck disable=SC2153
changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;"
startReplica="START REPLICA;"
fi
fi

Expand Down Expand Up @@ -494,7 +493,6 @@ docker_setup_db() {
${userGrants}

${changeMasterTo}
${startReplica}
EOSQL
}

Expand Down Expand Up @@ -590,8 +588,7 @@ docker_mariadb_upgrade() {
fi
mysql_note "Starting temporary server"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
mysql_note "Temporary server started."

docker_mariadb_backup_system
Expand All @@ -616,8 +613,7 @@ EOSQL
# need a restart as FLUSH PRIVILEGES isn't reversable
mysql_note "Restarting temporary server for upgrade"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
else
return 0
fi
Expand Down
5 changes: 5 additions & 0 deletions 10.6-ubi/healthcheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,11 @@ while [ $# -gt 0 ]; do
fi
nodefaults=
;;
--no-connect)
# used for /docker-entrypoint-initdb.d scripts
# where you definately don't want a connection test
connect_s=0
;;
--*)
test=${1#--}
;;
Expand Down
10 changes: 3 additions & 7 deletions 10.6/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ mysql_get_config() {
docker_temp_server_start() {
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
--expire-logs-days=0 \
--skip-slave-start \
--loose-innodb_buffer_pool_load_at_startup=0 \
&
declare -g MARIADB_PID
Expand Down Expand Up @@ -450,7 +451,6 @@ docker_setup_db() {
# To create replica user
local createReplicaUser=
local changeMasterTo=
local startReplica=
if [ -n "$MARIADB_REPLICATION_USER" ] ; then
if [ -z "$MARIADB_MASTER_HOST" ]; then
# on master
Expand All @@ -463,7 +463,6 @@ docker_setup_db() {
# SC cannot follow how MARIADB_MASTER_PORT is assigned a default value.
# shellcheck disable=SC2153
changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;"
startReplica="START REPLICA;"
fi
fi

Expand Down Expand Up @@ -494,7 +493,6 @@ docker_setup_db() {
${userGrants}

${changeMasterTo}
${startReplica}
EOSQL
}

Expand Down Expand Up @@ -590,8 +588,7 @@ docker_mariadb_upgrade() {
fi
mysql_note "Starting temporary server"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
mysql_note "Temporary server started."

docker_mariadb_backup_system
Expand All @@ -616,8 +613,7 @@ EOSQL
# need a restart as FLUSH PRIVILEGES isn't reversable
mysql_note "Restarting temporary server for upgrade"
docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \
--skip-slave-start
--loose-innodb_buffer_pool_dump_at_shutdown=0
else
return 0
fi
Expand Down
5 changes: 5 additions & 0 deletions 10.6/healthcheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,11 @@ while [ $# -gt 0 ]; do
fi
nodefaults=
;;
--no-connect)
# used for /docker-entrypoint-initdb.d scripts
# where you definately don't want a connection test
connect_s=0
;;
--*)
test=${1#--}
;;
Expand Down
Loading
Loading