Merge pull request lxc#502 from stgraber/empty

Improvements to empty instance handling
stgraber · Feb 17, 2024 · a77ce43 · a77ce43
2 parents 9b5472c + 3f253a1
commit a77ce43
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/internal/server/storage/backend.go b/internal/server/storage/backend.go
@@ -687,7 +687,22 @@ func (b *backend) CreateInstance(inst instance.Instance, op *operations.Operatio
 		return err
 	}
 
-	err = b.driver.CreateVolume(vol, nil, op)
+	var filler *drivers.VolumeFiller
+	if inst.Type() == instancetype.Container {
+		filler = &drivers.VolumeFiller{
+			Fill: func(vol drivers.Volume, rootBlockPath string, allowUnsafeResize bool) (int64, error) {
+				// Create an empty rootfs.
+				err := os.Mkdir(filepath.Join(vol.MountPath(), "rootfs"), 0755)
+				if err != nil && !os.IsExist(err) {
+					return 0, err
+				}
+
+				return 0, nil
+			},
+		}
+	}
+
+	err = b.driver.CreateVolume(vol, filler, op)
 	if err != nil {
 		return err
 	}

diff --git a/internal/server/storage/quota/projectquota.go b/internal/server/storage/quota/projectquota.go
@@ -12,6 +12,7 @@ package quota
 #include <stdlib.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include <errno.h>
 
 #ifndef FS_XFLAG_PROJINHERIT
 struct fsxattr {
@@ -80,6 +81,9 @@ int quota_set(char *dev_path, uint32_t id, uint64_t hard_bytes) {
 	fs_disk_quota_t xfsquota;
 
 	if (quotactl(QCMD(Q_GETQUOTA, PRJQUOTA), dev_path, id, (caddr_t)&quota) < 0) {
+		if (hard_bytes == 0 && errno == ENOENT)
+			return 0;
+
 		return -1;
 	}