Various bugfixes

cmd/incus/top.go

@@ -84,8 +84,8 @@ func (c *cmdTop) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// These variables can be changed by the UI
-	refreshInterval := 5 * time.Second // default 5 seconds, could change this to a flag
-	sortingMethod := alphabetical      // default is alphabetical, could change this to a flag
+	refreshInterval := 10 * time.Second // default 10 seconds, could change this to a flag
+	sortingMethod := alphabetical       // default is alphabetical, could change this to a flag
 
 	// Start the ticker for periodic updates
 	ticker := time.NewTicker(refreshInterval)
@@ -228,13 +228,24 @@ type displayData struct {
 }
 
 func (dd *displayData) toStringArray(project bool) []string {
+	var memUsage string
+	var diskUsage string
+
+	if dd.memoryUsage > 0 {
+		memUsage = units.GetByteSizeStringIEC(int64(dd.memoryUsage), 2)
+	}
+
+	if dd.diskUsage > 0 {
+		diskUsage = units.GetByteSizeStringIEC(int64(dd.diskUsage), 2)
+	}
+
 	if project {
 		dataStringified := [5]string{
 			dd.project,
 			dd.instanceName,
 			fmt.Sprintf("%.2f", dd.cpuUsage),
-			units.GetByteSizeStringIEC(int64(dd.memoryUsage), 2),
-			units.GetByteSizeStringIEC(int64(dd.diskUsage), 2),
+			memUsage,
+			diskUsage,
 		}
 
 		return dataStringified[:]
@@ -243,8 +254,8 @@ func (dd *displayData) toStringArray(project bool) []string {
 	dataStringified := [4]string{
 		dd.instanceName,
 		fmt.Sprintf("%.2f", dd.cpuUsage),
-		units.GetByteSizeStringIEC(int64(dd.memoryUsage), 2),
-		units.GetByteSizeStringIEC(int64(dd.diskUsage), 2),
+		memUsage,
+		diskUsage,
 	}
 
 	return dataStringified[:]

internal/server/device/disk.go

@@ -102,7 +102,12 @@ func (d *disk) CanMigrate() bool {
 	}
 
 	// Remote disks are migratable.
-	if d.pool.Driver().Info().Remote {
+	if d.pool != nil && d.pool.Driver().Info().Remote {
+		return true
+	}
+
+	// Virtual disks are migratable.
+	if !slices.Contains([]string{diskSourceCloudInit, diskSourceAgent}, d.config["source"]) {
 		return true
 	}
 
@@ -547,7 +552,7 @@ func (d *disk) validateConfig(instConf instance.ConfigReader) error {
 					return fmt.Errorf("Failed checking if custom volume is exclusively attached to another instance: %w", err)
 				}
 
-				if remoteInstance != nil && remoteInstance.ID != instConf.ID() {
+				if dbVolume.ContentType != db.StoragePoolVolumeContentTypeNameISO && remoteInstance != nil && remoteInstance.ID != instConf.ID() {
 					return fmt.Errorf("Custom volume is already attached to an instance on a different node")
 				}
 
@@ -629,7 +634,7 @@ func (d *disk) validateConfig(instConf instance.ConfigReader) error {
 			return fmt.Errorf("Shared filesystem are incompatible with migration.stateful=true")
 		}
 
-		if d.config["pool"] == "" {
+		if d.config["pool"] == "" && !slices.Contains([]string{diskSourceCloudInit, diskSourceAgent}, d.config["source"]) {
 			return fmt.Errorf("Only Incus-managed disks are allowed with migration.stateful=true")
 		}
 

internal/server/instance/drivers/driver_lxc.go

@@ -8695,9 +8695,20 @@ func (d *lxc) getFSStats() (*metrics.MetricSet, error) {
 				return nil, fmt.Errorf("Failed to stat %s: %w", mountpoint, err)
 			}
 
-			isMounted := false
+			// Grab the pool information to compare.
+			poolStatfs, err := linux.StatVFS(internalUtil.VarPath("storage-pools", dev["pool"]))
+			if err != nil {
+				return nil, fmt.Errorf("Failed to stat %s: %w", mountpoint, err)
+			}
+
+			// Check if we have actual mount-specific information.
+			if statfs.Type == poolStatfs.Type && statfs.Blocks == poolStatfs.Blocks && statfs.Bfree == poolStatfs.Bfree && statfs.Bavail == poolStatfs.Bavail {
+				continue
+			}
 
 			// Check if mountPath is in mountMap
+			isMounted := false
+
 			for mountDev, mountInfo := range mountMap {
 				if mountInfo.Mountpoint != mountpoint {
 					continue

internal/server/instance/drivers/driver_qemu.go

@@ -6793,7 +6793,7 @@ func (d *qemu) migrateSendLive(pool storagePools.Pool, clusterMoveSourceName str
 
 	// Notify the shared disks that they're going to be accessed from another system.
 	for _, dev := range d.expandedDevices.Sorted() {
-		if dev.Config["type"] != "disk" || dev.Config["path"] == "/" {
+		if dev.Config["type"] != "disk" || dev.Config["path"] == "/" || dev.Config["pool"] == "" {
 			continue
 		}
 
@@ -7305,7 +7305,7 @@ func (d *qemu) MigrateReceive(args instance.MigrateReceiveArgs) error {
 
 		// Notify the shared disks that they're going to be accessed from another system.
 		for _, dev := range d.expandedDevices.Sorted() {
-			if dev.Config["type"] != "disk" || dev.Config["path"] == "/" {
+			if dev.Config["type"] != "disk" || dev.Config["path"] == "/" || dev.Config["pool"] == "" {
 				continue
 			}
 

internal/server/storage/drivers/driver_lvm.go

@@ -126,7 +126,7 @@ func (d *lvm) Info() Info {
 		DirectIO:                     true,
 		IOUring:                      true,
 		MountedRoot:                  false,
-		Buckets:                      true,
+		Buckets:                      !d.isRemote(),
 	}
 }
 

internal/server/storage/drivers/driver_lvm_utils.go

@@ -778,9 +778,16 @@ func (d *lvm) activateVolume(vol Volume) (bool, error) {
 	}
 
 	if !util.PathExists(volDevPath) {
-		_, err := subprocess.RunCommand("lvchange", "--activate", "y", "--ignoreactivationskip", volDevPath)
-		if err != nil {
-			return false, fmt.Errorf("Failed to activate LVM logical volume %q: %w", volDevPath, err)
+		if d.clustered {
+			_, err := subprocess.RunCommand("lvchange", "--activate", "sy", "--ignoreactivationskip", volDevPath)
+			if err != nil {
+				return false, fmt.Errorf("Failed to activate LVM logical volume %q: %w", volDevPath, err)
+			}
+		} else {
+			_, err := subprocess.RunCommand("lvchange", "--activate", "y", "--ignoreactivationskip", volDevPath)
+			if err != nil {
+				return false, fmt.Errorf("Failed to activate LVM logical volume %q: %w", volDevPath, err)
+			}
 		}
 
 		d.logger.Debug("Activated logical volume", logger.Ctx{"volName": vol.Name(), "dev": volDevPath})

internal/server/storage/drivers/driver_lvm_volumes.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-	"time"
 
 	"golang.org/x/sys/unix"
 
@@ -167,35 +166,12 @@ func (d *lvm) CreateVolumeFromMigration(vol Volume, conn io.ReadWriteCloser, vol
 			return err
 		}
 
-		// Mark the volume for shared locking during live migration.
-		if vol.volType == VolumeTypeVM || vol.IsCustomBlock() {
-			volDevPath := d.lvmDevPath(d.config["lvm.vg_name"], vol.volType, vol.contentType, vol.Name())
-			_, err := subprocess.RunCommand("lvchange", "--activate", "sy", "--ignoreactivationskip", volDevPath)
+		if vol.IsVMBlock() {
+			fsVol := vol.NewVMBlockFilesystemVolume()
+			err := d.CreateVolumeFromMigration(fsVol, conn, volTargetArgs, preFiller, op)
 			if err != nil {
 				return err
 			}
-
-			go func(volDevPath string) {
-				// Attempt to re-lock as host-exclusive as soon as possible.
-				// This will only happen once the migration on the source system is fully over.
-				// Re-try every 10s until success as we can't predict how long a migration may take (from a few seconds to hours).
-				for {
-					_, err := subprocess.RunCommand("lvchange", "--activate", "ey", "--ignoreactivationskip", volDevPath)
-					if err == nil {
-						break
-					}
-
-					time.Sleep(10 * time.Second)
-				}
-			}(volDevPath)
-
-			if vol.IsVMBlock() {
-				fsVol := vol.NewVMBlockFilesystemVolume()
-				err := d.CreateVolumeFromMigration(fsVol, conn, volTargetArgs, preFiller, op)
-				if err != nil {
-					return err
-				}
-			}
 		}
 
 		return nil
@@ -869,7 +845,7 @@ func (d *lvm) RenameVolume(vol Volume, newVolName string, op *operations.Operati
 // MigrateVolume sends a volume for migration.
 func (d *lvm) MigrateVolume(vol Volume, conn io.ReadWriteCloser, volSrcArgs *migration.VolumeSourceArgs, op *operations.Operation) error {
 	if d.clustered && volSrcArgs.ClusterMove {
-		// Mark the volume for shared locking during live migration.
+		// Ensure the volume allows shared access.
 		if vol.volType == VolumeTypeVM || vol.IsCustomBlock() {
 			// Block volume.
 			volDevPath := d.lvmDevPath(d.config["lvm.vg_name"], vol.volType, vol.contentType, vol.Name())

shared/subprocess/proc_windows.go

@@ -9,7 +9,7 @@ import (
 )
 
 // Process struct. Has ability to set runtime arguments.
-type Process struct {}
+type Process struct{}
 
 // GetPid returns the pid for the given process object.
 func (p *Process) GetPid() (int64, error) {

test/suites/metrics.sh

@@ -49,8 +49,8 @@ test_metrics() {
   incus config set core.metrics_authentication=false
   curl -k -s -X GET "https://${metrics_addr}/1.0/metrics" | grep "name=\"c1\""
 
-  # Filesystem metrics should contain instance type
-  curl -k -s -X GET "https://${metrics_addr}/1.0/metrics" | grep "incus_filesystem_avail_bytes" | grep "type=\"container\""
+  # Check that metrics contain instance type
+  curl -k -s -X GET "https://${metrics_addr}/1.0/metrics" | grep "incus_cpu_effective_total" | grep "type=\"container\""
 
   incus delete -f c1 c2
 }