Commit ba934d30 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

First tests with Rocky Linux 9 and Python 3.12. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent fb2329e0

base/Dockerfile

+5 −5
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
# SPDX-License-Identifier: GPL-3.0-or-later

#



# Use Rocky Linux 8.9 minimal as base image

FROM rockylinux:8.9-minimal

# Use Rocky Linux 9.3 minimal as base image

FROM rockylinux:9.3-minimal



# Install epel repo, make, nano, openssh, wget, rsync, cronie, pip

RUN microdnf -y install epel-release make nano openssh-clients wget rsync cronie python3.11-pip

# Install epel repo, make, nano, openssh, iputils, wget, rsync, cronie, pip

RUN microdnf -y install epel-release make nano openssh-clients iputils wget rsync cronie python3.12-pip



# Install redis, psycopg2, paramiko, scp, tabulate Python packages

RUN pip3.11 install --no-cache-dir redis hiredis psycopg2-binary paramiko scp tabulate
 
RUN pip3.12 install --no-cache-dir redis hiredis psycopg2-binary paramiko scp tabulate

client/Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
# SPDX-License-Identifier: GPL-3.0-or-later

#



# Use python 3.11.7-slim as base image

FROM python:3.11.7-slim

# Use python 3.12.9-slim as base image

FROM python:3.12.9-slim



# Install psql client to be able to connect manually to the file_catalog container

# Install also redis-tools to be able to access the redis container via redis-cli
@@ -50,4 +50,4 @@ RUN echo ". /usr/share/bash-completion/completions/vos_data" >> .bashrc && \ 
    echo ". /usr/share/bash-completion/completions/vos_storage" >> .bashrc

    

# Install python dependencies

RUN pip3.11 install --no-cache-dir redis hiredis tabulate
 
RUN pip3.12 install --no-cache-dir redis hiredis tabulate

transfer_service/start.sh

+1 −1
Original line number Diff line number Diff line
@@ -15,4 +15,4 @@ do 
    chmod -R 755 /mnt/hot_storage/users/${user}

done



crond && /usr/bin/python3.11 transfer_service.py 2>&1 >> /var/log/vos_ts/error.log
 
crond && /usr/bin/python3.12 transfer_service.py 2>&1 >> /var/log/vos_ts/error.log

transfer_service/tape_client.py

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ class TapeClient(object): 
        """

        self.logger.info("Starting RECALL_CHECKSUM operation...")

        checksumFileList = f"vos_recall_checksum_files-{jobId}.lst"

        cmd = f"find $(dirname {dirName}) -type f \( -iname \"*-md5sum.txt\" \) > {self.VOSPACE_WD}/{checksumFileList} && {self.DSMRECALL} -filelist={self.VOSPACE_WD}/{checksumFileList} > /dev/null 2>&1"

        cmd = f"find $(dirname {dirName}) -type f \\( -iname \"*-md5sum.txt\" \\) > {self.VOSPACE_WD}/{checksumFileList} && {self.DSMRECALL} -filelist={self.VOSPACE_WD}/{checksumFileList} > /dev/null 2>&1"

        try:

            stdin, stdout, stderr = self.client.exec_command(cmd)

        except Exception: