diff options
| author | lassulus <lassulus@lassul.us> | 2023-01-18 20:05:23 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2023-01-18 20:05:23 +0100 |
| commit | f76693049d10ae507ae649bf3325c4bd8e536b2a (patch) | |
| tree | 3822c2b6ab6350b31426058649399c2dcc8c301d /lass | |
| parent | ad1320ce807e9a981b5b193394359fc2c2fe5fd0 (diff) | |
l sync-containers3: use atomic and nicer rsync
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/3modules/sync-containers3.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lass/3modules/sync-containers3.nix b/lass/3modules/sync-containers3.nix index 86aa40f03..9e7c4ddfd 100644 --- a/lass/3modules/sync-containers3.nix +++ b/lass/3modules/sync-containers3.nix @@ -104,9 +104,8 @@ in { consul lock sync_${ctr.name} ${pkgs.writers.writeDash "${ctr.name}-sync" '' set -efux if /run/wrappers/bin/ping -c 1 ${ctr.name}.r; then - touch "$HOME"/incomplete - rsync -a -e "ssh -i $CREDENTIALS_DIRECTORY/ssh_key" --timeout=30 --inplace container_sync@${ctr.name}.r:disk "$HOME"/disk - rm "$HOME"/incomplete + nice --adjustment=30 rsync -a -e "ssh -i $CREDENTIALS_DIRECTORY/ssh_key" --timeout=30 container_sync@${ctr.name}.r:disk "$HOME"/disk + rm -f "$HOME"/incomplete fi ''} ''; @@ -218,10 +217,6 @@ in { exit 0 ;; esac - if test -e /var/lib/sync-containers3/${ctr.name}/incomplete; then - echo 'data is inconistent, start aborted' - exit 1 - fi consul kv put containers/${ctr.name} "$(jq -cn '{host: "${config.networking.hostName}", time: now}')" >/dev/null consul lock -verbose -monitor-retry=100 -timeout 30s -name container_${ctr.name} container_${ctr.name} ${pkgs.writers.writeBash "${ctr.name}-start" '' set -efu |