Merge pull request #1060 from stgraber/main

incusd/storage/zfs: Always call tryGetVolumeDiskPathFromDataset
lxc · Jul 31, 2024 · 0a04d95 · 0a04d95
2 parents 8828254 + ecbe1e1
commit 0a04d95
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/internal/server/storage/drivers/driver_zfs_volumes.go b/internal/server/storage/drivers/driver_zfs_volumes.go
@@ -1928,7 +1928,11 @@ func (d *zfs) getVolumeDiskPathFromDataset(dataset string) (string, error) {
 
 // GetVolumeDiskPath returns the location of a root disk block device.
 func (d *zfs) GetVolumeDiskPath(vol Volume) (string, error) {
-	return d.getVolumeDiskPathFromDataset(d.dataset(vol, false))
+	// Wait up to 30 seconds for the device to appear.
+	ctx, cancel := context.WithTimeout(d.state.ShutdownCtx, 30*time.Second)
+	defer cancel()
+
+	return d.tryGetVolumeDiskPathFromDataset(ctx, d.dataset(vol, false))
 }
 
 // ListVolumes returns a list of volumes in storage pool.