oignon: try to fix backup over USB

diff --git a/hosts/oignon/backup.nix b/hosts/oignon/backup.nix
index f782c099b9f6852e1bded67bd3ddd4e76c7a5735..039842cba8ae924efe40f01c53feb76b98ed8829 100644 (file)
--- a/hosts/oignon/backup.nix
+++ b/hosts/oignon/backup.nix
@@ -36,32 +36,36 @@ services.udev.extraRules = ''
 systemd.services."zfs-force-import@" = {
   description = "ZFS force import: %I";
   unitConfig.StopWhenUnneeded = true;
-  requires = [ "sys-subsystem-usb-%i.device" ];
+  bindsTo = [ "sys-subsystem-usb-%i.device" ];
+  path = lib.mkBefore [ "/run/booted-system/sw" ];
   serviceConfig = {
     Type = "oneshot";
     RemainAfterExit = true;
     PrivateTmp = true;
-    ExecStartPre = [
-      # Scan the zpools, using stable paths
-      "/bin/sh -xc '/run/booted-system/sw/bin/zpool import -d /dev/disk/by-id/ || true'"
-    ];
-    ExecStart = ''
-      /bin/sh -xc ' \
-        /run/booted-system/sw/bin/zpool import -lFd /dev/disk/by-id/ %I || \
-        /run/booted-system/sw/bin/zpool reopen %I || \
-        /run/booted-system/sw/bin/zpool clear -nFX %I'
-    '';
-    ExecStartPost = [
+    ExecStart = pkgs.writeShellScript "zfs-force-import" ''
+      DESTPOOL=$1
+      set -eux
+      # Import the zpool, using stable paths
+      zpool import -d /dev/disk/by-id/ || true
+      zpool import -lFd /dev/disk/by-id/ "$DESTPOOL" ||
+      zpool reopen "$DESTPOOL" ||
+      zpool import -f -d /dev/disk/by-id/ "$DESTPOOL" ||
+      zpool clear -nFX "$DESTPOOL"
+    '' + " %I";
+    ExecStartPost = "+" + pkgs.writeShellScript "zfs-force-import-startPost" ''
+      DESTPOOL=$1
+      set -eux
       # Do not block on unplug/failure
-      "/run/booted-system/sw/bin/zpool set failmode=continue %I"
-    ];
+      zpool set failmode=continue "$DESTPOOL"
+    '' + " %I";
   };
 };
 # Run the backup
 systemd.services."zfs-local-backup-home@" = {
   description = "ZFS backup home, on: %I";
   after = [ "zfs-force-import@%i.service" ];
-  requires = [ "zfs-force-import@%i.service" ];
+  bindsTo = [ "zfs-force-import@%i.service" ];
+  path = lib.mkBefore [ "/run/booted-system/sw" ];
   serviceConfig = rec {
     Type = "oneshot";
     RemainAfterExit = true;
@@ -70,11 +74,15 @@ systemd.services."zfs-local-backup-home@" = {
     RuntimeDirectory = [ "zfs-usb-backup-%I" ];
     User = "julm";
     Group = "users";
-    ExecStartPre = [
-      "+/run/booted-system/sw/bin/zfs allow ${User} bookmark,hold,mount,send ${hostName}/home"
-      "+/run/booted-system/sw/bin/zfs allow ${User} bookmark,create,destroy,load-key,mount,mountpoint,receive,rollback,snapshot %I/${User}"
-      "+/bin/sh -xc '/run/booted-system/sw/bin/zpool scrub -p %I || true'"
-    ];
+    ExecStartPre = "+" + pkgs.writeShellScript "zfs-local-backup-home-startPre" ''
+      DESTPOOL=$1
+      set -eux
+      if zpool status "$DESTPOOL"; then
+        zfs allow ${User} bookmark,hold,mount,send ${hostName}/home
+        zfs allow ${User} bookmark,create,destroy,load-key,mount,mountpoint,receive,rollback,snapshot "$DESTPOOL"/${User}
+        zpool scrub -p "$DESTPOOL" || true
+      fi
+    '' + " %I";
     ExecStart = pkgs.writeShellScript "zfs-local-backup-home" ''
       set -eu
       DESTPOOL=$1
@@ -113,14 +121,21 @@ systemd.services."zfs-local-backup-home@" = {
           "$DESTPOOL"/${User}/backup/"$dataset"
       done
     '' + " %I";
-    ExecStartPost = [
-      # Scrub the zpool 1 minute (in the background)
-      "+/run/booted-system/sw/bin/zpool scrub %I"
-      "${pkgs.coreutils}/bin/sleep 60"
-      "+/bin/sh -xc '/run/booted-system/sw/bin/zpool scrub -p %I || true'"
-      # Export the zpool (to avoid a forced import later on)
-      "+/run/booted-system/sw/bin/zpool export %I"
-    ];
+    ExecStartPost = "+" + pkgs.writeShellScript "zfs-local-backup-home-startPost" ''
+      DESTPOOL=$1
+      set -eux
+      # Only if the zpool still exists to avoid uninterruptible hanging
+      if zpool status "$DESTPOOL"; then
+        # Scrub the zpool 1 minute (in the background)
+        zpool scrub "$DESTPOOL"
+        sleep 60
+      fi
+      if zpool status "$DESTPOOL"; then
+        zpool scrub -p "$DESTPOOL" || true
+        # Export the zpool (to avoid a forced import later on)
+        zpool export "$DESTPOOL"
+      fi
+    '' + " %I";
   };
 };
 }

diff --git a/hosts/patate/backup.nix b/hosts/patate/backup.nix
index 35f5a8503013db099ef6b3479034d01df1a9f392..649485f9b570a46a45a172c80e3b8d1fe3c24a48 100644 (file)
--- a/hosts/patate/backup.nix
+++ b/hosts/patate/backup.nix
@@ -36,32 +36,36 @@ services.udev.extraRules = ''
 systemd.services."zfs-force-import@" = {
   description = "ZFS force import: %I";
   unitConfig.StopWhenUnneeded = true;
-  requires = [ "sys-subsystem-usb-%i.device" ];
+  bindsTo = [ "sys-subsystem-usb-%i.device" ];
+  path = lib.mkBefore [ "/run/booted-system/sw" ];
   serviceConfig = {
     Type = "oneshot";
     RemainAfterExit = true;
     PrivateTmp = true;
-    ExecStartPre = [
-      # Scan the zpools, using stable paths
-      "/bin/sh -xc '/run/booted-system/sw/bin/zpool import -d /dev/disk/by-id/ || true'"
-    ];
-    ExecStart = ''
-      /bin/sh -xc ' \
-        /run/booted-system/sw/bin/zpool import -lFd /dev/disk/by-id/ %I || \
-        /run/booted-system/sw/bin/zpool reopen %I || \
-        /run/booted-system/sw/bin/zpool clear -nFX %I'
-    '';
-    ExecStartPost = [
+    ExecStart = pkgs.writeShellScript "zfs-force-import" ''
+      DESTPOOL=$1
+      set -eux
+      # Import the zpool, using stable paths
+      zpool import -d /dev/disk/by-id/ || true
+      zpool import -lFd /dev/disk/by-id/ "$DESTPOOL" ||
+      zpool reopen "$DESTPOOL" ||
+      zpool import -f -d /dev/disk/by-id/ "$DESTPOOL" ||
+      zpool clear -nFX "$DESTPOOL"
+    '' + " %I";
+    ExecStartPost = "+" + pkgs.writeShellScript "zfs-force-import-startPost" ''
+      DESTPOOL=$1
+      set -eux
       # Do not block on unplug/failure
-      "/run/booted-system/sw/bin/zpool set failmode=continue %I"
-    ];
+      zpool set failmode=continue "$DESTPOOL"
+    '' + " %I";
   };
 };
 # Run the backup
 systemd.services."zfs-local-backup-home@" = {
   description = "ZFS backup home, on: %I";
   after = [ "zfs-force-import@%i.service" ];
-  requires = [ "zfs-force-import@%i.service" ];
+  bindsTo = [ "zfs-force-import@%i.service" ];
+  path = lib.mkBefore [ "/run/booted-system/sw" ];
   serviceConfig = rec {
     Type = "oneshot";
     RemainAfterExit = true;
@@ -70,11 +74,15 @@ systemd.services."zfs-local-backup-home@" = {
     RuntimeDirectory = [ "zfs-usb-backup-%I" ];
     User = "sevy";
     Group = "users";
-    ExecStartPre = [
-      "+/run/booted-system/sw/bin/zfs allow ${User} bookmark,hold,mount,send ${hostName}/home"
-      "+/run/booted-system/sw/bin/zfs allow ${User} bookmark,create,destroy,load-key,mount,mountpoint,receive,rollback,snapshot %I/${User}"
-      "+/bin/sh -xc '/run/booted-system/sw/bin/zpool scrub -p %I || true'"
-    ];
+    ExecStartPre = "+" + pkgs.writeShellScript "zfs-local-backup-home-startPre" ''
+      DESTPOOL=$1
+      set -eux
+      if zpool status "$DESTPOOL"; then
+        zfs allow ${User} bookmark,hold,mount,send ${hostName}/home
+        zfs allow ${User} bookmark,create,destroy,load-key,mount,mountpoint,receive,rollback,snapshot "$DESTPOOL"/${User}
+        zpool scrub -p "$DESTPOOL" || true
+      fi
+    '' + " %I";
     ExecStart = pkgs.writeShellScript "zfs-local-backup-home" ''
       set -eu
       DESTPOOL=$1
@@ -114,14 +122,21 @@ systemd.services."zfs-local-backup-home@" = {
           "$DESTPOOL"/${User}/backup/"$dataset"
       done
     '' + " %I";
-    ExecStartPost = [
-      # Scrub the zpool 1 minute (in the background)
-      "+/run/booted-system/sw/bin/zpool scrub %I"
-      "${pkgs.coreutils}/bin/sleep 60"
-      "+/bin/sh -xc '/run/booted-system/sw/bin/zpool scrub -p %I || true'"
-      # Export the zpool (to avoid a forced import later on)
-      "+/run/booted-system/sw/bin/zpool export %I"
-    ];
+    ExecStartPost = "+" + pkgs.writeShellScript "zfs-local-backup-home-startPost" ''
+      DESTPOOL=$1
+      set -eux
+      # Only if the zpool still exists to avoid uninterruptible hanging
+      if zpool status "$DESTPOOL"; then
+        # Scrub the zpool 1 minute (in the background)
+        zpool scrub "$DESTPOOL"
+        sleep 60
+      fi
+      if zpool status "$DESTPOOL"; then
+        zpool scrub -p "$DESTPOOL" || true
+        # Export the zpool (to avoid a forced import later on)
+        zpool export "$DESTPOOL"
+      fi
+    '' + " %I";
   };
 };
 }