1berry/mariadb-docker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use SHOW REPLICA[S} STATUS for healthcheck.sh

Browse Source
This commit is contained in:
Daniel Black 2023-06-20 16:39:17 +10:00
parent cd7489a9ff
commit 1b4b2584a4
12 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
10.10/healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

2
10.11/healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

2
10.4/healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} SLAVE${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

2
10.5/healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

2
10.6/healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

2
10.9/healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

2
11.0/healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

2
11.1/healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

2
11.2/healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

2
healthcheck.sh
View File

@ -129,7 +129,7 @@ replication()
# SHOW REPLICA available 10.5+ # SHOW REPLICA available 10.5+
# https://github.com/koalaman/shellcheck/issues/2383 # https://github.com/koalaman/shellcheck/issues/2383
# shellcheck disable=SC2016,SC2026 # shellcheck disable=SC2016,SC2026
_process_sql -e "show ${repl['all']:+all} slave${repl['all']:+s} ${repl['name']:+'${repl['name']}'} status\G" | \ _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \
{ {
# required for trim of leading space. # required for trim of leading space.
shopt -s extglob shopt -s extglob

1
update.sh
View File

@ -63,6 +63,7 @@ update_version()
-e 's/REPLICATION REPLICA/REPLICATION SLAVE/' \ -e 's/REPLICATION REPLICA/REPLICATION SLAVE/' \
-e 's/START REPLICA/START SLAVE/' \ -e 's/START REPLICA/START SLAVE/' \
"$version/docker-entrypoint.sh" "$version/docker-entrypoint.sh"
sed -i -e 's/ REPLICA\$/ SLAVE$/' "$version"/healthcheck.sh
;; # almost nothing to see/do here ;; # almost nothing to see/do here
10.5) 10.5)
sed -i -e '/--old-mode/d' "$version/docker-entrypoint.sh" sed -i -e '/--old-mode/d' "$version/docker-entrypoint.sh"

28
versions.json
View File

@ -1,4 +1,18 @@
{ {
"11.2": {
"milestone": "11.2",
"version": "11.2.0",
"fullVersion": "1:11.2.0+maria~ubu2204",
"releaseStatus": "Alpha",
"supportType": "Unknown",
"base": "ubuntu:jammy",
"arches": [
"amd64",
"arm64v8",
"ppc64le",
"s390x"
]
},
"11.1": { "11.1": {
"milestone": "11.1", "milestone": "11.1",
"version": "11.1.1", "version": "11.1.1",
@ -109,19 +123,5 @@
"arm64v8", "arm64v8",
"ppc64le" "ppc64le"
] ]
},
"11.2": {
"milestone": "11.2",
"version": "11.2.0",
"fullVersion": "1:11.2.0+maria~ubu2204",
"releaseStatus": "Alpha",
"supportType": "Unknown",
"base": "ubuntu:jammy",
"arches": [
"amd64",
"arm64v8",
"ppc64le",
"s390x"
]
} }
} }