vc: Revert "vc: change container rootfs to be a mount"

This reverts commit 196661b.

Reverting because cri-o with devicemapper started
to fail after this commit was merged.

Fixes: #1574.

cli/create.go

@@ -128,7 +128,7 @@ func create(ctx context.Context, containerID, bundlePath, console, pidFilePath s
 	disableOutput := noNeedForOutput(detach, ociSpec.Process.Terminal)
 
 	//rootfs has been mounted by containerd shim
-	rootFs := vc.Mount{Mounted: true}
+	rootFs := vc.RootFs{Mounted: true}
 
 	var process vc.Process
 	switch containerType {

containerd-shim-v2/create.go

@@ -10,13 +10,12 @@ package containerdshim
 import (
 	"context"
 	"fmt"
-	"os"
-	"path/filepath"
-
 	"github.com/containerd/typeurl"
 	vc "github.com/kata-containers/runtime/virtcontainers"
 	"github.com/kata-containers/runtime/virtcontainers/pkg/oci"
 	"github.com/pkg/errors"
+	"os"
+	"path/filepath"
 
 	taskAPI "github.com/containerd/containerd/runtime/v2/task"
 
@@ -32,7 +31,7 @@ import (
 )
 
 func create(ctx context.Context, s *service, r *taskAPI.CreateTaskRequest, netns string) (*container, error) {
-	rootFs := vc.Mount{Mounted: s.mount}
+	rootFs := vc.RootFs{Mounted: s.mount}
 	if len(r.Rootfs) == 1 {
 		m := r.Rootfs[0]
 		rootFs.Source = m.Source

pkg/katautils/create.go

@@ -172,7 +172,7 @@ func SetEphemeralStorageType(ociSpec oci.CompatOCISpec) oci.CompatOCISpec {
 }
 
 // CreateSandbox create a sandbox container
-func CreateSandbox(ctx context.Context, vci vc.VC, ociSpec oci.CompatOCISpec, runtimeConfig oci.RuntimeConfig, rootFs vc.Mount,
+func CreateSandbox(ctx context.Context, vci vc.VC, ociSpec oci.CompatOCISpec, runtimeConfig oci.RuntimeConfig, rootFs vc.RootFs,
 	containerID, bundlePath, console string, disableOutput, systemdCgroup, builtIn bool) (vc.VCSandbox, vc.Process, error) {
 	span, ctx := Trace(ctx, "createSandbox")
 	defer span.Finish()
@@ -237,7 +237,7 @@ func CreateSandbox(ctx context.Context, vci vc.VC, ociSpec oci.CompatOCISpec, ru
 }
 
 // CreateContainer create a container
-func CreateContainer(ctx context.Context, vci vc.VC, sandbox vc.VCSandbox, ociSpec oci.CompatOCISpec, rootFs vc.Mount, containerID, bundlePath, console string, disableOutput, builtIn bool) (vc.Process, error) {
+func CreateContainer(ctx context.Context, vci vc.VC, sandbox vc.VCSandbox, ociSpec oci.CompatOCISpec, rootFs vc.RootFs, containerID, bundlePath, console string, disableOutput, builtIn bool) (vc.Process, error) {
 	var c vc.VCContainer
 
 	span, ctx := Trace(ctx, "createContainer")

pkg/katautils/create_test.go

@@ -306,7 +306,7 @@ func TestCreateSandboxConfigFail(t *testing.T) {
 		Quota: &quota,
 	}
 
-	rootFs := vc.Mount{Mounted: true}
+	rootFs := vc.RootFs{Mounted: true}
 
 	_, _, err = CreateSandbox(context.Background(), testingImpl, spec, runtimeConfig, rootFs, testContainerID, bundlePath, testConsole, true, true, false)
 	assert.Error(err)
@@ -342,7 +342,7 @@ func TestCreateSandboxFail(t *testing.T) {
 	spec, err := readOCIConfigFile(ociConfigFile)
 	assert.NoError(err)
 
-	rootFs := vc.Mount{Mounted: true}
+	rootFs := vc.RootFs{Mounted: true}
 
 	_, _, err = CreateSandbox(context.Background(), testingImpl, spec, runtimeConfig, rootFs, testContainerID, bundlePath, testConsole, true, true, false)
 	assert.Error(err)
@@ -381,7 +381,7 @@ func TestCreateContainerContainerConfigFail(t *testing.T) {
 	err = writeOCIConfigFile(spec, ociConfigFile)
 	assert.NoError(err)
 
-	rootFs := vc.Mount{Mounted: true}
+	rootFs := vc.RootFs{Mounted: true}
 
 	for _, disableOutput := range []bool{true, false} {
 		_, err = CreateContainer(context.Background(), testingImpl, nil, spec, rootFs, testContainerID, bundlePath, testConsole, disableOutput, false)
@@ -424,7 +424,7 @@ func TestCreateContainerFail(t *testing.T) {
 	err = writeOCIConfigFile(spec, ociConfigFile)
 	assert.NoError(err)
 
-	rootFs := vc.Mount{Mounted: true}
+	rootFs := vc.RootFs{Mounted: true}
 
 	for _, disableOutput := range []bool{true, false} {
 		_, err = CreateContainer(context.Background(), testingImpl, nil, spec, rootFs, testContainerID, bundlePath, testConsole, disableOutput, false)
@@ -474,7 +474,7 @@ func TestCreateContainer(t *testing.T) {
 	err = writeOCIConfigFile(spec, ociConfigFile)
 	assert.NoError(err)
 
-	rootFs := vc.Mount{Mounted: true}
+	rootFs := vc.RootFs{Mounted: true}
 
 	for _, disableOutput := range []bool{true, false} {
 		_, err = CreateContainer(context.Background(), testingImpl, nil, spec, rootFs, testContainerID, bundlePath, testConsole, disableOutput, false)

virtcontainers/api.go

@@ -601,7 +601,7 @@ func statusContainer(sandbox *Sandbox, containerID string) (ContainerStatus, err
 				State:       container.state,
 				PID:         container.process.Pid,
 				StartTime:   container.process.StartTime,
-				RootFs:      container.config.RootFs.Destination,
+				RootFs:      container.config.RootFs.Target,
 				Annotations: container.config.Annotations,
 			}, nil
 		}

virtcontainers/api_test.go

@@ -62,7 +62,7 @@ func newTestSandboxConfigNoop() SandboxConfig {
 	// Define the container command and bundle.
 	container := ContainerConfig{
 		ID:          containerID,
-		RootFs:      Mount{Destination: filepath.Join(testDir, testBundle), Mounted: true},
+		RootFs:      RootFs{Target: filepath.Join(testDir, testBundle), Mounted: true},
 		Cmd:         newBasicTestCmd(),
 		Annotations: containerAnnotations,
 	}
@@ -751,7 +751,7 @@ func newTestContainerConfigNoop(contID string) ContainerConfig {
 	// Define the container command and bundle.
 	container := ContainerConfig{
 		ID:          contID,
-		RootFs:      Mount{Destination: filepath.Join(testDir, testBundle), Mounted: true},
+		RootFs:      RootFs{Target: filepath.Join(testDir, testBundle), Mounted: true},
 		Cmd:         newBasicTestCmd(),
 		Annotations: containerAnnotations,
 	}

virtcontainers/container.go

@@ -209,7 +209,7 @@ type ContainerConfig struct {
 	ID string
 
 	// RootFs is the container workload image on the host.
-	RootFs Mount
+	RootFs RootFs
 
 	// ReadOnlyRootfs indicates if the rootfs should be mounted readonly
 	ReadonlyRootfs bool
@@ -272,13 +272,27 @@ type ContainerDevice struct {
 	GID uint32
 }
 
+// RootFs describes the container's rootfs.
+type RootFs struct {
+	// Source specifies the BlockDevice path
+	Source string
+	// Target specify where the rootfs is mounted if it has been mounted
+	Target string
+	// Type specifies the type of filesystem to mount.
+	Type string
+	// Options specifies zero or more fstab style mount options.
+	Options []string
+	// Mounted specifies whether the rootfs has be mounted or not
+	Mounted bool
+}
+
 // Container is composed of a set of containers and a runtime environment.
 // A Container can be created, deleted, started, stopped, listed, entered, paused and restored.
 type Container struct {
 	id        string
 	sandboxID string
 
-	rootFs Mount
+	rootFs RootFs
 
 	config *ContainerConfig
 
@@ -357,6 +371,19 @@ func (c *Container) SetPid(pid int) error {
 	return c.storeProcess()
 }
 
+func (c *Container) setStateFstype(fstype string) error {
+	c.state.Fstype = fstype
+
+	if !c.sandbox.supportNewStore() {
+		// experimental runtime use "persist.json" which doesn't need "state.json" anymore
+		if err := c.storeState(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // GetAnnotations returns container's annotations
 func (c *Container) GetAnnotations() map[string]string {
 	return c.config.Annotations
@@ -384,6 +411,10 @@ func (c *Container) storeDevices() error {
 	return c.store.Store(store.DeviceIDs, c.devices)
 }
 
+func (c *Container) storeState() error {
+	return c.store.Store(store.State, c.state)
+}
+
 func (c *Container) loadMounts() ([]Mount, error) {
 	var mounts []Mount
 	if err := c.store.Load(store.Mounts, &mounts); err != nil {
@@ -1152,14 +1183,6 @@ func (c *Container) resume() error {
 }
 
 func (c *Container) hotplugDrive() error {
-	if err := c.hotplugRootfsDrive(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Container) hotplugRootfsDrive() error {
 	var dev device
 	var err error
 
@@ -1169,7 +1192,7 @@ func (c *Container) hotplugRootfsDrive() error {
 		// there is no "rootfs" dir on block device backed rootfs
 		c.rootfsSuffix = ""
 	} else {
-		dev, err = getDeviceForPath(c.rootFs.Destination)
+		dev, err = getDeviceForPath(c.rootFs.Target)
 	}
 
 	if err == errMountPointNotFound {
@@ -1198,15 +1221,14 @@ func (c *Container) hotplugRootfsDrive() error {
 	devicePath := c.rootFs.Source
 	fsType := c.rootFs.Type
 	if c.rootFs.Mounted {
-		if dev.mountPoint == c.rootFs.Destination {
+		if dev.mountPoint == c.rootFs.Target {
 			c.rootfsSuffix = ""
 		}
 		// If device mapper device, then fetch the full path of the device
 		devicePath, fsType, err = GetDevicePathAndFsType(dev.mountPoint)
 		if err != nil {
 			return err
 		}
-		c.rootFs.Type = fsType
 	}
 
 	devicePath, err = filepath.EvalSymlinks(devicePath)
@@ -1219,7 +1241,11 @@ func (c *Container) hotplugRootfsDrive() error {
 		"fs-type":     fsType,
 	}).Info("Block device detected")
 
-	return c.plugDevice(devicePath)
+	if err = c.plugDevice(devicePath); err != nil {
+		return err
+	}
+
+	return c.setStateFstype(fsType)
 }
 
 func (c *Container) plugDevice(devicePath string) error {
@@ -1240,7 +1266,7 @@ func (c *Container) plugDevice(devicePath string) error {
 			return fmt.Errorf("device manager failed to create rootfs device for %q: %v", devicePath, err)
 		}
 
-		c.rootFs.BlockDeviceID = b.DeviceID()
+		c.state.BlockDeviceID = b.DeviceID()
 
 		// attach rootfs device
 		if err := c.sandbox.devManager.AttachDevice(b.DeviceID(), c.sandbox); err != nil {
@@ -1254,11 +1280,16 @@ func (c *Container) plugDevice(devicePath string) error {
 	return nil
 }
 
+// isDriveUsed checks if a drive has been used for container rootfs
+func (c *Container) isDriveUsed() bool {
+	return !(c.state.Fstype == "")
+}
+
 func (c *Container) removeDrive() (err error) {
-	if c.rootFs.BlockDeviceID != "" {
+	if c.isDriveUsed() {
 		c.Logger().Info("unplugging block device")
 
-		devID := c.rootFs.BlockDeviceID
+		devID := c.state.BlockDeviceID
 		err := c.sandbox.devManager.DetachDevice(devID, c.sandbox)
 		if err != nil && err != manager.ErrDeviceNotAttached {
 			return err

virtcontainers/container_test.go

@@ -106,7 +106,7 @@ func TestContainerRemoveDrive(t *testing.T) {
 		id:      "testContainer",
 	}
 
-	container.rootFs.Type = ""
+	container.state.Fstype = ""
 	err = container.removeDrive()
 
 	// hotplugRemoveDevice for hypervisor should not be called.
@@ -131,8 +131,8 @@ func TestContainerRemoveDrive(t *testing.T) {
 	err = sandbox.storeSandboxDevices()
 	assert.Nil(t, err)
 
-	container.rootFs.Type = "xfs"
-	container.rootFs.BlockDeviceID = device.DeviceID()
+	container.state.Fstype = "xfs"
+	container.state.BlockDeviceID = device.DeviceID()
 	err = container.removeDrive()
 	assert.Nil(t, err, "remove drive should succeed")
 }
@@ -245,7 +245,7 @@ func TestContainerAddDriveDir(t *testing.T) {
 	container := Container{
 		sandbox: sandbox,
 		id:      contID,
-		rootFs:  Mount{Destination: fakeRootfs, Mounted: true},
+		rootFs:  RootFs{Target: fakeRootfs, Mounted: true},
 	}
 
 	containerStore, err := store.NewVCContainerStore(sandbox.ctx, sandbox.id, container.id)
@@ -272,14 +272,14 @@ func TestContainerAddDriveDir(t *testing.T) {
 		checkStorageDriver = savedFunc
 	}()
 
-	container.rootFs.Type = "xfs"
+	container.state.Fstype = ""
 
 	err = container.hotplugDrive()
 	if err != nil {
 		t.Fatalf("Error with hotplugDrive :%v", err)
 	}
 
-	if container.rootFs.Type == "" {
+	if container.state.Fstype == "" {
 		t.Fatal()
 	}
 }
@@ -315,7 +315,7 @@ func TestContainerRootfsPath(t *testing.T) {
 	container := Container{
 		id:           "rootfstestcontainerid",
 		sandbox:      sandbox,
-		rootFs:       Mount{Destination: fakeRootfs, Mounted: true},
+		rootFs:       RootFs{Target: fakeRootfs, Mounted: true},
 		rootfsSuffix: "rootfs",
 	}
 	cvcstore, err := store.NewVCContainerStore(context.Background(),
@@ -328,7 +328,7 @@ func TestContainerRootfsPath(t *testing.T) {
 	assert.Empty(t, container.rootfsSuffix)
 
 	// Reset the value to test the other case
-	container.rootFs = Mount{Destination: fakeRootfs + "/rootfs", Mounted: true}
+	container.rootFs = RootFs{Target: fakeRootfs + "/rootfs", Mounted: true}
 	container.rootfsSuffix = "rootfs"
 
 	container.hotplugDrive()

virtcontainers/example_pod_run_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/kata-containers/runtime/virtcontainers/types"
 )
 
-var containerRootfs = vc.Mount{Destination: "/var/lib/container/bundle/", Mounted: true}
+var containerRootfs = vc.RootFs{Target: "/var/lib/container/bundle/", Mounted: true}
 
 // This example creates and starts a single container sandbox,
 // using qemu as the hypervisor and kata as the VM agent.

virtcontainers/kata_agent.go

@@ -944,7 +944,7 @@ func (k *kataAgent) rollbackFailingContainerCreation(c *Container) {
 }
 
 func (k *kataAgent) buildContainerRootfs(sandbox *Sandbox, c *Container, rootPathParent string) (*grpc.Storage, error) {
-	if c.rootFs.BlockDeviceID != "" {
+	if c.state.Fstype != "" && c.state.BlockDeviceID != "" {
 		// The rootfs storage volume represents the container rootfs
 		// mount point inside the guest.
 		// It can be a block based device (when using block based container
@@ -953,10 +953,10 @@ func (k *kataAgent) buildContainerRootfs(sandbox *Sandbox, c *Container, rootPat
 		rootfs := &grpc.Storage{}
 
 		// This is a block based device rootfs.
-		device := sandbox.devManager.GetDeviceByID(c.rootFs.BlockDeviceID)
+		device := sandbox.devManager.GetDeviceByID(c.state.BlockDeviceID)
 		if device == nil {
-			k.Logger().WithField("device", c.rootFs.BlockDeviceID).Error("failed to find device by id")
-			return nil, fmt.Errorf("failed to find device by id %q", c.rootFs.BlockDeviceID)
+			k.Logger().WithField("device", c.state.BlockDeviceID).Error("failed to find device by id")
+			return nil, fmt.Errorf("failed to find device by id %q", c.state.BlockDeviceID)
 		}
 
 		blockDrive, ok := device.GetDeviceInfo().(*config.BlockDrive)
@@ -976,11 +976,10 @@ func (k *kataAgent) buildContainerRootfs(sandbox *Sandbox, c *Container, rootPat
 			rootfs.Source = blockDrive.SCSIAddr
 		}
 		rootfs.MountPoint = rootPathParent
-		rootfs.Fstype = c.rootFs.Type
-		rootfs.Options = c.rootFs.Options
+		rootfs.Fstype = c.state.Fstype
 
-		if rootfs.Fstype == "xfs" {
-			rootfs.Options = append(rootfs.Options, "nouuid")
+		if c.state.Fstype == "xfs" {
+			rootfs.Options = []string{"nouuid"}
 		}
 
 		return rootfs, nil
@@ -994,7 +993,7 @@ func (k *kataAgent) buildContainerRootfs(sandbox *Sandbox, c *Container, rootPat
 	// (kataGuestSharedDir) is already mounted in the
 	// guest. We only need to mount the rootfs from
 	// the host and it will show up in the guest.
-	if err := bindMountContainerRootfs(k.ctx, kataHostSharedDir, sandbox.id, c.id, c.rootFs.Destination, false); err != nil {
+	if err := bindMountContainerRootfs(k.ctx, kataHostSharedDir, sandbox.id, c.id, c.rootFs.Target, false); err != nil {
 		return nil, err
 	}