Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vospace-transfer-service
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VOSpace INAF
vospace-transfer-service
Commits
ba934d30
Commit
ba934d30
authored
2 months ago
by
Cristiano Urban
Browse files
Options
Downloads
Patches
Plain Diff
First tests with Rocky Linux 9 and Python 3.12.
Signed-off-by:
Cristiano Urban
<
cristiano.urban@inaf.it
>
parent
fb2329e0
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
base/Dockerfile
+5
-5
5 additions, 5 deletions
base/Dockerfile
client/Dockerfile
+3
-3
3 additions, 3 deletions
client/Dockerfile
transfer_service/start.sh
+1
-1
1 addition, 1 deletion
transfer_service/start.sh
transfer_service/tape_client.py
+1
-1
1 addition, 1 deletion
transfer_service/tape_client.py
with
10 additions
and
10 deletions
base/Dockerfile
+
5
−
5
View file @
ba934d30
...
@@ -4,11 +4,11 @@
...
@@ -4,11 +4,11 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-License-Identifier: GPL-3.0-or-later
#
#
# Use Rocky Linux
8.9
minimal as base image
# Use Rocky Linux
9.3
minimal as base image
FROM
rockylinux:
8.9
-minimal
FROM
rockylinux:
9.3
-minimal
# Install epel repo, make, nano, openssh, wget, rsync, cronie, pip
# Install epel repo, make, nano, openssh,
iputils,
wget, rsync, cronie, pip
RUN
microdnf
-y
install
epel-release make nano openssh-clients wget rsync cronie python3.1
1
-pip
RUN
microdnf
-y
install
epel-release make nano openssh-clients
iputils
wget rsync cronie python3.1
2
-pip
# Install redis, psycopg2, paramiko, scp, tabulate Python packages
# Install redis, psycopg2, paramiko, scp, tabulate Python packages
RUN
pip3.1
1
install
--no-cache-dir
redis hiredis psycopg2-binary paramiko scp tabulate
RUN
pip3.1
2
install
--no-cache-dir
redis hiredis psycopg2-binary paramiko scp tabulate
This diff is collapsed.
Click to expand it.
client/Dockerfile
+
3
−
3
View file @
ba934d30
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-License-Identifier: GPL-3.0-or-later
#
#
# Use python 3.1
1.7
-slim as base image
# Use python 3.1
2.9
-slim as base image
FROM
python:3.1
1.7
-slim
FROM
python:3.1
2.9
-slim
# Install psql client to be able to connect manually to the file_catalog container
# 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
# 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 && \
...
@@ -50,4 +50,4 @@ RUN echo ". /usr/share/bash-completion/completions/vos_data" >> .bashrc && \
echo
". /usr/share/bash-completion/completions/vos_storage"
>>
.bashrc
echo
". /usr/share/bash-completion/completions/vos_storage"
>>
.bashrc
# Install python dependencies
# Install python dependencies
RUN
pip3.1
1
install
--no-cache-dir
redis hiredis tabulate
RUN
pip3.1
2
install
--no-cache-dir
redis hiredis tabulate
This diff is collapsed.
Click to expand it.
transfer_service/start.sh
+
1
−
1
View file @
ba934d30
...
@@ -15,4 +15,4 @@ do
...
@@ -15,4 +15,4 @@ do
chmod
-R
755 /mnt/hot_storage/users/
${
user
}
chmod
-R
755 /mnt/hot_storage/users/
${
user
}
done
done
crond
&&
/usr/bin/python3.1
1
transfer_service.py 2>&1
>>
/var/log/vos_ts/error.log
crond
&&
/usr/bin/python3.1
2
transfer_service.py 2>&1
>>
/var/log/vos_ts/error.log
This diff is collapsed.
Click to expand it.
transfer_service/tape_client.py
+
1
−
1
View file @
ba934d30
...
@@ -184,7 +184,7 @@ class TapeClient(object):
...
@@ -184,7 +184,7 @@ class TapeClient(object):
"""
"""
self
.
logger
.
info
(
"
Starting RECALL_CHECKSUM operation...
"
)
self
.
logger
.
info
(
"
Starting RECALL_CHECKSUM operation...
"
)
checksumFileList
=
f
"
vos_recall_checksum_files-
{
jobId
}
.lst
"
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
:
try
:
stdin
,
stdout
,
stderr
=
self
.
client
.
exec_command
(
cmd
)
stdin
,
stdout
,
stderr
=
self
.
client
.
exec_command
(
cmd
)
except
Exception
:
except
Exception
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment