Merge pull request #6947 from fstagni/81_removeMySQL57

[8.1] removed compatibility test for MySQL 5.7
DIRACGrid · Mar 29, 2023 · 31cec63 · 31cec63
2 parents c6a5c33 + 337621c
commit 31cec63
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -31,8 +31,6 @@ jobs:
       matrix:
         # TEST_NAME is a dummy variable used to make it easier to read the web interface
         include:
-          - TEST_NAME: "MySQL 5.7"
-            ARGS: MYSQL_VER=mysql:5.7
           - TEST_NAME: "MariaDB 10.6, opensearch:2.1.0"
             ARGS: MYSQL_VER=mariadb:10.6.3 ES_VER=opensearchproject/opensearch:2.1.0
           - TEST_NAME: "HTTPS"

diff --git a/docs/source/AdministratorGuide/ExternalsSupport/index.rst b/docs/source/AdministratorGuide/ExternalsSupport/index.rst
@@ -18,7 +18,6 @@ MySQL versions
 
 MySQL is a hard dependency for all DIRAC servers installations. Supported versions:
 
-- MySQL 5.7
 - MySQL 8.0
 - MariaDB versions "compatible" with the above MySQL versions.
 

diff --git a/docs/source/AdministratorGuide/Tutorials/basicTutoSetup.rst b/docs/source/AdministratorGuide/Tutorials/basicTutoSetup.rst
@@ -106,7 +106,7 @@ make ``runsvdir-start`` executable and (re)start ``runsvdir``:
 Install MySQL
 -------------
 
-First of all, remove the existing (outdated) installation, and install all the necessary RPMs for MySQL 5.7:
+First of all, remove the existing (outdated) installation, and install all the necessary RPMs for MySQL 8.0:
 
 .. literalinclude:: basicTutoSetup.sh
    :language: bash

diff --git a/docs/source/AdministratorGuide/Tutorials/basicTutoSetup.sh b/docs/source/AdministratorGuide/Tutorials/basicTutoSetup.sh
@@ -70,11 +70,11 @@ systemctl start runsvdir-start
 yum remove -y $(rpm -qa | grep -i -e mysql -e mariadb | paste -sd ' ') || echo  "MySQL is not yet installed"
 rm -rf /var/lib/mysql/*
 yum install -y \
-    https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-community-devel-5.7.25-1.el7.x86_64.rpm \
-    https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-community-server-5.7.25-1.el7.x86_64.rpm \
-    https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-community-client-5.7.25-1.el7.x86_64.rpm \
-    https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-community-libs-5.7.25-1.el7.x86_64.rpm \
-    https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-community-common-5.7.25-1.el7.x86_64.rpm
+    https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-community-devel-8.0.32-1.el7.x86_64.rpm \
+    https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-community-server-8.0.32-1.el7.x86_64.rpm \
+    https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-community-client-8.0.32-1.el7.x86_64.rpm \
+    https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-community-libs-8.0.32-1.el7.x86_64.rpm \
+    https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-community-common-8.0.32-1.el7.x86_64.rpm
 # END mysqlInstall
 
 # START mysqlStart

diff --git a/src/DIRAC/DataManagementSystem/DB/FTS3DB.py b/src/DIRAC/DataManagementSystem/DB/FTS3DB.py
@@ -369,7 +369,7 @@ def updateFileStatus(self, fileStatusDict, ftsGUID=None):
         # This here is inneficient as we update every files, even if it did not change, and we commit every time.
         # It would probably be best to update only the files that changed.
         # However, commiting every time is the recommendation of MySQL
-        # (https://dev.mysql.com/doc/refman/5.7/en/innodb-deadlocks-handling.html)
+        # (https://dev.mysql.com/doc/refman/8.0/en/innodb-deadlocks-handling.html)
 
         for fileID, valueDict in fileStatusDict.items():
             session = self.dbSession()