Merge pull request #1758 from stgraber/main

incus/file: Always use 1MB chunks for SFTP

Author: hallyn

cmd/incus/file.go

@@ -1006,9 +1006,16 @@ func (c *cmdFile) sftpCreateFile(sftpConn *sftp.Client, targetPath string, args
 		defer func() { _ = file.Close() }()
 
 		if push {
-			_, err = io.Copy(file, args.Content)
-			if err != nil {
-				return err
+			for {
+				// Read 1MB at a time.
+				_, err = io.CopyN(file, args.Content, 1024*1024)
+				if err != nil {
+					if err == io.EOF {
+						break
+					}
+
+					return err
+				}
 			}
 		}
 
@@ -1126,10 +1133,17 @@ func (c *cmdFile) recursivePullFile(sftpConn *sftp.Client, p string, targetDir s
 			},
 		}
 
-		_, err = io.Copy(writer, src)
-		if err != nil {
-			progress.Done("")
-			return err
+		for {
+			// Read 1MB at a time.
+			_, err = io.CopyN(writer, src, 1024*1024)
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
+
+				progress.Done("")
+				return err
+			}
 		}
 
 		err = src.Close()

internal/server/instance/drivers/driver_lxc.go

@@ -441,6 +441,10 @@ type lxc struct {
 var idmapLock sync.Mutex
 
 func (d *lxc) findIdmap() (*idmap.Set, int64, error) {
+	if d.state.OS.IdmapSet == nil {
+		return nil, 0, fmt.Errorf("System doesn't have a functional idmap setup")
+	}
+
 	idmapSize := func(size string) (int64, error) {
 		var idMapSize int64
 		if size == "" || size == "auto" {