zfs-with-vdevs: increase pool import timeout

Fix fixes a long-standing test failures we have with the zfs-with-vdevs.
nix-community · Oct 1, 2024 · 4e30bc7 · 4e30bc7
1 parent fc3ba69
commit 4e30bc7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/example/zfs-with-vdevs.nix b/example/zfs-with-vdevs.nix
@@ -93,8 +93,6 @@
             cache = [ "cache" ];
           };
         };
-        # Workaround: cannot import 'zroot': I/O error in disko tests
-        options.cachefile = "none";
 
         rootFsOptions = {
           compression = "zstd";

diff --git a/tests/zfs-with-vdevs.nix b/tests/zfs-with-vdevs.nix
@@ -8,6 +8,15 @@ diskoLib.testLib.makeDiskoTest {
   extraInstallerConfig.networking.hostId = "8425e349";
   extraSystemConfig = {
     networking.hostId = "8425e349";
+    # It looks like the 60s of NixOS is sometimes not enough for our virtio-based zpool.
+    # This fixes the flakeiness of the test.
+    boot.initrd.postResumeCommands = ''
+      for i in $(seq 1 120); do
+        if zpool list | grep -q zroot || zpool import -N zroot; then
+          break
+        fi
+      done
+    '';
   };
   extraTestScript = ''
     def assert_property(ds, property, expected_value):