Skip to content
Snippets Groups Projects
Commit b3e5f0be authored by Jörg Sachse's avatar Jörg Sachse
Browse files

feat: use --workdir on network shares to make sure that repair workflow doesn't run out of space

parent 72cbf89f
No related branches found
No related tags found
No related merge requests found
Pipeline #3052 failed
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
daemon-reload: true daemon-reload: true
- name: enable systemd-units - name: enable systemd-units
ansible.builtin.command: "systemctl enable /etc/systemd/user/{{ item }}.service" ansible.builtin.command: "systemctl enable /usr/local/lib/systemd/system/{{ item }}.service"
loop: "{{ vault_service_files.keys() | list }}" loop: "{{ vault_service_files.keys() | list }}"
# https://docs.ansible.com/ansible/latest/collections/ansible/builtin/systemd_module.html # https://docs.ansible.com/ansible/latest/collections/ansible/builtin/systemd_module.html
......
...@@ -32,3 +32,12 @@ ...@@ -32,3 +32,12 @@
opts: "{{ item.opts | default('defaults,nodev,nosuid,rsize=65536,wsize=65536,vers=3') }}" opts: "{{ item.opts | default('defaults,nodev,nosuid,rsize=65536,wsize=65536,vers=3') }}"
loop: "{{ vault_nfs_mounts | flatten(levels=1) }}" loop: "{{ vault_nfs_mounts | flatten(levels=1) }}"
tags: [molecule-notest] tags: [molecule-notest]
- name: create subdirectories in NFS mounts
ansible.builtin.file:
path: "{{ item[0] }}/{{ item[1] }}"
state: directory
mode: "0777" # it's a mixed mode share, so actual mode is 0777 anyway
loop: "{{ vault_nfs_mounts | map(attribute='name') | product( ['unprocessed', 'processed', 'workdir']) }}"
when: '"/var/log/" not in item[0]'
tags: [ci]
--- ---
- name: Verzeichnis für Unitfiles erstellen - name: Verzeichnis für Unitfiles erstellen
ansible.builtin.file: ansible.builtin.file:
path: "/etc/systemd/user/" path: "/usr/local/lib/systemd/system/"
state: directory state: directory
mode: "755" mode: "0755"
- name: Systemd-Unitfiles disablen
ansible.builtin.systemd:
unit: "{{ item.key }}"
state: stopped
enabled: false
with_dict: "{{ vault_service_files }}"
notify: systemctl daemon-reload
- name: Systemd-Unitfiles entfernen
ansible.builtin.file:
path: "/etc/systemd/user/{{ item.key }}.service"
state: absent
with_dict: "{{ vault_service_files }}"
- name: Systemd-Unitfiles installieren - name: Systemd-Unitfiles installieren
ansible.builtin.template: ansible.builtin.template:
src: "etc/systemd/user/{{ item.key }}.service.j2" src: "usr/local/lib/systemd/system/{{ item.key }}.service.j2"
dest: "/etc/systemd/user/{{ item.key }}.service" dest: "/usr/local/lib/systemd/system/{{ item.key }}.service"
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0400" mode: "0400"
......
...@@ -3,7 +3,17 @@ Description=Repair Tool Daemon (DDZ) ...@@ -3,7 +3,17 @@ Description=Repair Tool Daemon (DDZ)
After=network.target After=network.target
[Service] [Service]
ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl --sourcedir=/mnt/lza_repair_ddz/unprocessed/ --targetdir=/mnt/lza_repair_ddz/processed/ --logdir=/mnt/lza_repair_ddz/log/ --minwait=65 --minfileage=65 --crashmail="{{ vault_service_files.repair_daemon_ddz.crashmail }}" --daemonname="Repair-Daemon-DDZ" --nomd5file --workers 2 ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl \
--sourcedir=/mnt/lza_repair_ddz/unprocessed/ \
--targetdir=/mnt/lza_repair_ddz/processed/ \
--workdir=/mnt/lza_repair_ddz/workdir/ \
--logdir=/mnt/lza_repair_ddz/log/ \
--minwait=65 \
--minfileage=65 \
--crashmail="{{ vault_service_files.repair_daemon_ddz.crashmail }}" \
--daemonname="Repair-Daemon-DDZ" \
--nomd5file \
--workers 2
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
KillMode=process KillMode=process
Restart=on-failure Restart=on-failure
......
...@@ -3,7 +3,16 @@ Description=Repair Tool Daemon (DiGAS) ...@@ -3,7 +3,16 @@ Description=Repair Tool Daemon (DiGAS)
After=network.target After=network.target
[Service] [Service]
ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl --sourcedir=/mnt/lza_repair_digas/unprocessed/ --targetdir=/mnt/lza_repair_digas/processed/ --logdir=/mnt/lza_repair_digas/log/ --minwait=65 --minfileage=65 --crashmail="{{ vault_service_files.repair_daemon_digas.crashmail }}" --daemonname="Repair-Daemon-DiGAS" --workers 2 ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl \
--sourcedir=/mnt/lza_repair_digas/unprocessed/ \
--targetdir=/mnt/lza_repair_digas/processed/ \
--workdir=/mnt/lza_repair_digas/workdir/ \
--logdir=/mnt/lza_repair_digas/log/ \
--minwait=65 \
--minfileage=65 \
--crashmail="{{ vault_service_files.repair_daemon_digas.crashmail }}" \
--daemonname="Repair-Daemon-DiGAS" \
--workers 2
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
KillMode=process KillMode=process
Restart=on-failure Restart=on-failure
......
...@@ -3,7 +3,17 @@ Description=Repair Tool Daemon (Fotothek) ...@@ -3,7 +3,17 @@ Description=Repair Tool Daemon (Fotothek)
After=network.target After=network.target
[Service] [Service]
ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl --sourcedir=/mnt/lza_repair_fotothek/unprocessed/ --targetdir=/mnt/lza_repair_fotothek/processed/ --logdir=/mnt/lza_repair_fotothek/log/ --minwait=65 --minfileage=65 --crashmail="{{ vault_service_files.repair_daemon_fotothek.crashmail }}" --daemonname="Repair-Daemon-Fotothek" --workers 2 --citcfg="{{ vault_service_files.repair_daemon_fotothek.citcfg }}" ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl \
--sourcedir=/mnt/lza_repair_fotothek/unprocessed/ \
--targetdir=/mnt/lza_repair_fotothek/processed/ \
--workdir=/mnt/lza_repair_fotothek/workdir/ \
--logdir=/mnt/lza_repair_fotothek/log/ \
--minwait=65 \
--minfileage=65 \
--crashmail="{{ vault_service_files.repair_daemon_fotothek.crashmail }}" \
--daemonname="Repair-Daemon-Fotothek" \
--workers 2 \
--citcfg="{{ vault_service_files.repair_daemon_fotothek.citcfg }}"
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
KillMode=process KillMode=process
Restart=on-failure Restart=on-failure
......
...@@ -9,4 +9,4 @@ tool_versions_public: ...@@ -9,4 +9,4 @@ tool_versions_public:
- package_name: "libtiff-tools" - package_name: "libtiff-tools"
version: "4.2.0-1+deb11u1" version: "4.2.0-1+deb11u1"
- package_name: "libslub-lza-repair-perl" - package_name: "libslub-lza-repair-perl"
version: "0.9.25-1" version: "0.9.26-1"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment