change how mariadb healthcheck is done in actions

the current approach of using mysqladmin ping was failing all the time, using the healtcheck script contained in the container image should be enough, since it ensures the instance is reachable mysql containers still use mysqladmin ping (since healthcheck.sh is not available for them)
HerculesWS · Jul 9, 2023 · caf051e · caf051e
1 parent ce0392b
commit caf051e
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,7 +39,11 @@ jobs:
           MYSQL_USER: 'ragnarok'
           MYSQL_PASSWORD: 'ragnarok'
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
     env:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb

diff --git a/.github/workflows/clang15_test.yml b/.github/workflows/clang15_test.yml
@@ -35,7 +35,11 @@ jobs:
           MYSQL_USER: 'ragnarok'
           MYSQL_PASSWORD: 'ragnarok'
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
     env:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb

diff --git a/.github/workflows/gcc_test.yml b/.github/workflows/gcc_test.yml
@@ -35,7 +35,11 @@ jobs:
           MYSQL_USER: 'ragnarok'
           MYSQL_PASSWORD: 'ragnarok'
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
     env:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb

diff --git a/.github/workflows/gccold1.yml b/.github/workflows/gccold1.yml
@@ -36,7 +36,11 @@ jobs:
           MYSQL_USER: 'ragnarok'
           MYSQL_PASSWORD: 'ragnarok'
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
     env:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb

diff --git a/.github/workflows/gccold2.yml b/.github/workflows/gccold2.yml
@@ -36,7 +36,11 @@ jobs:
           MYSQL_USER: 'ragnarok'
           MYSQL_PASSWORD: 'ragnarok'
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
     env:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb

diff --git a/.github/workflows/gccold3.yml b/.github/workflows/gccold3.yml
@@ -37,7 +37,11 @@ jobs:
           MYSQL_USER: 'ragnarok'
           MYSQL_PASSWORD: 'ragnarok'
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
     env:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb

diff --git a/.github/workflows/gccsnapshot_test.yml b/.github/workflows/gccsnapshot_test.yml
@@ -35,7 +35,11 @@ jobs:
           MYSQL_USER: 'ragnarok'
           MYSQL_PASSWORD: 'ragnarok'
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
     env:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb

diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
@@ -33,7 +33,11 @@ jobs:
           MYSQL_USER: 'ragnarok'
           MYSQL_PASSWORD: 'ragnarok'
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
     env:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mysql