Add new option "cache" to container and volume

Signed-off-by: Hui Zhu <teawater@hyper.sh>

daemon/pod/container.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/hyperhq/hypercontainer-utils/hlog"
 	"github.com/hyperhq/hyperd/errors"
+	"github.com/hyperhq/hyperd/storage"
 	apitypes "github.com/hyperhq/hyperd/types"
 	"github.com/hyperhq/hyperd/utils"
 	runv "github.com/hyperhq/runv/api"
@@ -888,6 +889,12 @@ func (c *Container) addToSandbox() error {
 		c.Log(ERROR, "failed to prepare rootfs: %v", err)
 		return err
 	}
+	if root.Format != "vfs" && root.Format != "nas" {
+		root.Cache = c.spec.Cache
+		if root.Cache == "" {
+			root.Cache = storage.DEFAULT_VOL_CACHE
+		}
+	}
 	c.descript.RootVolume = root
 
 	c.Log(TRACE, "finished container prepare, wait for volumes")

daemon/pod/mount.go

@@ -39,6 +39,7 @@ func ProbeExistingVolume(v *apitypes.UserVolume, sharedDir string) (*runv.Volume
 		Source: v.Source,
 		Format: v.Format,
 		Fstype: v.Fstype,
+		Cache:  v.Cache,
 	}
 
 	if v.Option != nil {
@@ -64,6 +65,10 @@ func ProbeExistingVolume(v *apitypes.UserVolume, sharedDir string) (*runv.Volume
 		}
 	}
 
+	if vol.Cache == "" && v.Format != "vfs" && v.Format != "nas" {
+		vol.Cache = storage.DEFAULT_VOL_CACHE
+	}
+
 	return vol, nil
 }
 

storage/defaults.go

@@ -8,4 +8,5 @@ const (
 	DEFAULT_DM_VOL_SIZE  int    = 2 * 1024 * 1024 * 1024
 	DEFAULT_VOL_FS              = "ext4"
 	DEFAULT_VOL_MKFS            = "mkfs.ext4"
+	DEFAULT_VOL_CACHE           = "writeback"
 )