From 1654186ddce0b04b29b0a71d4976eab015ee4a45 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Wed, 26 Feb 2025 12:08:03 +0100 Subject: [PATCH] Add a deterministic sleep to spread out the load and lets run it at night in test --- manifests/app_type.pp | 2 +- manifests/multinode.pp | 2 +- templates/application/scan_external_mounts.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/manifests/app_type.pp b/manifests/app_type.pp index 193ed9c..35b628b 100644 --- a/manifests/app_type.pp +++ b/manifests/app_type.pp @@ -114,7 +114,7 @@ define sunetdrive::app_type ( command => '/usr/local/bin/scan_external_mounts', user => 'root', minute => '20', - hour => '10', + hour => '1', } } file { '/opt/nextcloud/cron.sh': diff --git a/manifests/multinode.pp b/manifests/multinode.pp index 8471d1a..50594ee 100644 --- a/manifests/multinode.pp +++ b/manifests/multinode.pp @@ -59,7 +59,7 @@ class sunetdrive::multinode ( command => '/usr/local/bin/scan_external_mounts', user => 'root', minute => '20', - hour => '10', + hour => '1', } } file { '/usr/local/bin/nocc': diff --git a/templates/application/scan_external_mounts.sh b/templates/application/scan_external_mounts.sh index 557daf0..9673dcf 100644 --- a/templates/application/scan_external_mounts.sh +++ b/templates/application/scan_external_mounts.sh @@ -1,4 +1,7 @@ #!/bin/bash +# We sleep a deterministic amount of time, which will be between 0 an 128 m and allways the same within +# a specific host, but will differ between hosts +sleep $((16#$(ip a | grep "link/ether" | head -1 | awk -F ':' '{print $6}' | awk '{print $1}') / 2))m # Only run if this is the only instance of this script running # note: since this script forks to run pgrep, we need -eq 2 here