fix: Made mariadb works better

Author: Robin-Van-de-Merghel

integration_tests.py

@@ -573,7 +573,7 @@ def _gen_docker_compose(modules, *, diracx_dist_dir=None):
     # Load the docker compose configuration and mount the necessary volumes
     input_fn = Path(__file__).parent / "tests/CI/docker-compose.yml"
     docker_compose = yaml.safe_load(input_fn.read_text())
-    # diracx-wait-for-db needs the volume to be able to run the witing script
+    # diracx-wait-for-db needs the volume to be able to run the waiting script
     for ctn in ("dirac-server", "dirac-client", "dirac-pilot", "diracx-wait-for-db"):
         if "volumes" not in docker_compose["services"][ctn]:
             docker_compose["services"][ctn]["volumes"] = []

tests/CI/check_db_initialized.sh

@@ -1,22 +1,43 @@
 #!/bin/bash
-dbMissing=true;
-allDBs=(AccountingDB FTS3DB JobDB JobLoggingDB PilotAgentsDB ProductionDB ProxyDB ReqDB ResourceManagementDB ResourceStatusDB SandboxMetadataDB StorageManagementDB TaskQueueDB TransformationDB)
-while ${dbMissing};
-do
-    dbMissing=false;
-    allExistingDBs=$(mysql -uDirac -pDirac -h mysql -P 3306 -e "show databases;");
-    for db in "${allDBs[@]}";
-    do
-        if grep -q "${db}" <<< "${allExistingDBs}";
-        then
-            echo "${db} OK";
-        else
-            echo "${db} not created";
-            dbMissing=true;
-        fi;
-    done;
-    if ${dbMissing};
-    then
-        sleep 1;
+DB_USER="Dirac"
+DB_PASS="Dirac"
+DB_HOST="mysql"
+DB_PORT=3306
+DB_CMD=""
+
+# Detect available client: maria or mysql
+if command -v mariadb >/dev/null 2>&1; then
+    DB_CMD="mariadb -u${DB_USER} -p${DB_PASS} -h${DB_HOST} -P${DB_PORT}"
+elif command -v mysql >/dev/null 2>&1; then
+    DB_CMD="mysql -u${DB_USER} -p${DB_PASS} -h${DB_HOST} -P${DB_PORT}"
+else
+    echo "❌ Neither mysql nor mariadb client found in PATH."
+    exit 1
+fi
+
+echo "Using client: ${DB_CMD%% *}"
+
+dbMissing=true
+allDBs=(
+  AccountingDB FTS3DB JobDB JobLoggingDB PilotAgentsDB ProductionDB
+  ProxyDB ReqDB ResourceManagementDB ResourceStatusDB
+  SandboxMetadataDB StorageManagementDB TaskQueueDB TransformationDB
+)
+
+while $dbMissing; do
+  dbMissing=false
+  allExistingDBs=$($DB_CMD -e "SHOW DATABASES;" 2>/dev/null)
+
+  for db in "${allDBs[@]}"; do
+    if grep -q "^${db}$" <<<"$allExistingDBs"; then
+      echo "✅ ${db} exists"
+    else
+      echo "⚠️ ${db} not created yet"
+      dbMissing=true
     fi
+  done
+
+  $dbMissing && sleep 10
 done
+
+echo "🎉 All databases are present."