From 337621c81cde92f10d99f2c02aa3aa0dc7565ca6 Mon Sep 17 00:00:00 2001 From: fstagni Date: Wed, 29 Mar 2023 13:22:35 +0200 Subject: [PATCH] test: removed compatibility test for MySQL 5.7 --- .github/workflows/integration.yml | 2 -- .../AdministratorGuide/ExternalsSupport/index.rst | 1 - .../AdministratorGuide/Tutorials/basicTutoSetup.rst | 2 +- .../AdministratorGuide/Tutorials/basicTutoSetup.sh | 10 +++++----- src/DIRAC/DataManagementSystem/DB/FTS3DB.py | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f43caf8647f..fd6386ce4a4 100644 --- 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 index db642abee9b..abf3d402cba 100644 --- 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 index bbecc895594..cbfe40d2c63 100644 --- 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 index 865a06d2ad5..cc46cb535d2 100644 --- 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 index 5dd87228493..cf5ccc8454a 100644 --- 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()