Merge pull request #677 from bergwolf/storage-base-size

fix storage base size support

Author: laijs

cmd/hyperd/hyperd.go

@@ -111,7 +111,7 @@ func mainDaemon(opt *Options) {
 		}
 	}
 
-	daemon.InitDockerCfg(strings.Split(opt.Mirrors, ","), strings.Split(opt.InsecureRegistries, ","), c.StorageDriver, c.Root)
+	daemon.InitDockerCfg(strings.Split(opt.Mirrors, ","), strings.Split(opt.InsecureRegistries, ","), c.StorageDriver, c.StorageBaseSize, c.Root)
 	d, err := daemon.NewDaemon(c)
 	if err != nil {
 		glog.Errorf("The hyperd create failed, %s", err.Error())

daemon/daemon.go

@@ -159,7 +159,7 @@ var (
 func presentInHelp(usage string) string { return usage }
 func absentFromHelp(string) string      { return "" }
 
-func InitDockerCfg(mirrors []string, insecureRegistries []string, graphdriver, root string) {
+func InitDockerCfg(mirrors []string, insecureRegistries []string, graphdriver, basesize, root string) {
 	if dockerCfg.LogConfig.Config == nil {
 		dockerCfg.LogConfig.Config = make(map[string]string)
 	}
@@ -172,6 +172,13 @@ func InitDockerCfg(mirrors []string, insecureRegistries []string, graphdriver, r
 	dockerCfg.GraphDriver = graphdriver
 	dockerCfg.Root = root
 	dockerCfg.TrustKeyPath = path.Join(root, "keys")
+	if basesize != "" {
+		if graphdriver == "devicemapper" {
+			dockerCfg.GraphOptions = append(dockerCfg.GraphOptions, fmt.Sprintf("dm.basesize=%s", basesize))
+		} else if graphdriver == "rawblock" {
+			dockerCfg.GraphOptions = append(dockerCfg.GraphOptions, fmt.Sprintf("rawblock.basesize=%s", basesize))
+		}
+	}
 
 	// disable docker network
 	flags.Set("-bridge", "none")

daemon/storage.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	dockertypes "github.com/docker/engine-api/types"
+	"github.com/docker/go-units"
 	"github.com/golang/glog"
 	"github.com/hyperhq/hyperd/daemon/daemondb"
 	"github.com/hyperhq/hyperd/storage"
@@ -105,8 +106,12 @@ func (dms *DevMapperStorage) RootPath() string {
 
 func (dms *DevMapperStorage) Init(c *apitypes.HyperConfig) error {
 	size := storage.DEFAULT_DM_POOL_SIZE
-	if c.StorageBaseSize > 0 {
-		size = c.StorageBaseSize
+	if c.StorageBaseSize != "" {
+		nsize, err := units.RAMInBytes(c.StorageBaseSize)
+		if err != nil {
+			return err
+		}
+		size = int(nsize)
 	}
 	dmPool := dm.DeviceMapper{
 		Datafile:         filepath.Join(utils.HYPER_ROOT, "lib") + "/data",
@@ -205,7 +210,7 @@ func (dms *DevMapperStorage) CreateVolume(podId string, spec *apitypes.UserVolum
 		}
 		dev_id_str := strconv.Itoa(dev_id)
 
-		err = dm.CreateVolume(dms.VolPoolName, deviceName, dev_id_str, storage.DEFAULT_VOL_MKFS, storage.DEFAULT_DM_VOL_SIZE, restore)
+		err = dm.CreateVolume(dms.VolPoolName, deviceName, dev_id_str, storage.DEFAULT_VOL_MKFS, dms.DmPoolData.Size, restore)
 		if err != nil && !restore && strings.Contains(err.Error(), "failed: File exists") {
 			glog.V(1).Infof("retry for dev_id #%d creating collision: %v", dev_id, err)
 			continue
@@ -501,6 +506,7 @@ func (s *BtrfsStorage) RemoveVolume(podId string, record []byte) error {
 
 type RawBlockStorage struct {
 	rootPath string
+	size     int64
 }
 
 func RawBlockFactory(_ *dockertypes.Info, _ *daemondb.DaemonDB) (Storage, error) {
@@ -519,9 +525,21 @@ func (s *RawBlockStorage) RootPath() string {
 }
 
 func (s *RawBlockStorage) Init(c *apitypes.HyperConfig) error {
-	if err := os.MkdirAll(filepath.Join(s.RootPath(), "volumes"), 0700); err != nil {
+	err := os.MkdirAll(filepath.Join(s.RootPath(), "volumes"), 0700)
+	if err != nil {
 		return err
 	}
+
+	size := int64(storage.DEFAULT_DM_VOL_SIZE)
+	if c.StorageBaseSize != "" {
+		size, err = units.RAMInBytes(c.StorageBaseSize)
+		if err != nil {
+			return err
+		}
+	}
+
+	s.size = size
+
 	return nil
 }
 
@@ -555,7 +573,7 @@ func (s *RawBlockStorage) InjectFile(src io.Reader, mountId, target, baseDir str
 
 func (s *RawBlockStorage) CreateVolume(podId string, spec *apitypes.UserVolume) error {
 	block := filepath.Join(s.RootPath(), "volumes", fmt.Sprintf("%s-%s", podId, spec.Name))
-	if err := rawblock.CreateBlock(block, "xfs", "", uint64(storage.DEFAULT_DM_VOL_SIZE)); err != nil {
+	if err := rawblock.CreateBlock(block, "xfs", "", uint64(s.size)); err != nil {
 		return err
 	}
 	spec.Source = block

package/dist/etc/hyper/config

@@ -30,6 +30,8 @@ Initrd=/var/lib/hyper/hyper-initrd.img
 
 # Storage driver for hyperd, valid value includes rawblock, devicemapper, overlay, and aufs
 # StorageDriver=overlay
+# StorageBaseSize only valid for devicemapper and rawblock
+# StorageBaseSize=10GB
 
 # Bridge device for hyperd, default is hyper0
 # Bridge=

storage/graphdriver/rawblock/driver.go

@@ -5,10 +5,13 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"sync"
 
 	"github.com/docker/docker/daemon/graphdriver"
 	"github.com/docker/docker/pkg/idtools"
+	"github.com/docker/docker/pkg/parsers"
+	"github.com/docker/go-units"
 	"github.com/golang/glog"
 	"github.com/opencontainers/runc/libcontainer/label"
 	//"github.com/docker/docker/pkg/mount"
@@ -88,12 +91,31 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
 		return nil, err
 	}
 
+	var blockSize = uint64(10 * 1024 * 1024 * 1024)
+	for _, option := range options {
+		key, val, err := parsers.ParseKeyValueOpt(option)
+		if err != nil {
+			return nil, err
+		}
+		key = strings.ToLower(key)
+		switch key {
+		case "rawblock.basesize":
+			size, err := units.RAMInBytes(val)
+			if err != nil {
+				return nil, err
+			}
+			blockSize = uint64(size)
+		default:
+			return nil, fmt.Errorf("rawblock: Unknown option %s\n", key)
+		}
+	}
+
 	d := &Driver{
 		home:      home,
 		backingFs: backingFs,
 		cow:       cow,
 		blockFs:   blockFs,
-		blockSize: 10, // TODO: make it configurable
+		blockSize: blockSize,
 		uid:       rootUID,
 		gid:       rootGID,
 		active:    map[string]int{},
@@ -111,7 +133,7 @@ func (d *Driver) Status() [][2]string {
 		{"Backing Filesystem", d.backingFs},
 		{"Support Copy-On-Write", fmt.Sprintf("%v", d.cow)},
 		{"Block Filesystem", d.blockFs},
-		{"Block Size", fmt.Sprintf("%dGB", d.blockSize)},
+		{"Block Size", fmt.Sprintf("%s", units.HumanSize(float64(d.blockSize)))},
 	}
 }
 
@@ -131,7 +153,7 @@ func (d *Driver) Create(id, parent, mountLabel string) error {
 		return err
 	}
 	if parent == "" {
-		return CreateBlock(d.block(id), d.blockFs, mountLabel, d.blockSize*1024*1024*1024)
+		return CreateBlock(d.block(id), d.blockFs, mountLabel, d.blockSize)
 	}
 	if out, err := exec.Command("cp", "-a", "--reflink=auto", d.block(parent), d.block(id)).CombinedOutput(); err != nil {
 		return fmt.Errorf("Failed to reflink:%v:%s", err, string(out))

types/config.go

@@ -17,7 +17,7 @@ type HyperConfig struct {
 	Host            string
 	GRPCHost        string
 	StorageDriver   string
-	StorageBaseSize int
+	StorageBaseSize string
 	VmFactoryPolicy string
 	Driver          string
 	Kernel          string
@@ -56,7 +56,7 @@ func NewHyperConfig(config string) *HyperConfig {
 	}
 
 	c.StorageDriver, _ = cfg.GetValue(goconfig.DEFAULT_SECTION, "StorageDriver")
-	c.StorageBaseSize = cfg.MustInt(goconfig.DEFAULT_SECTION, "StorageBaseSize", 0)
+	c.StorageBaseSize, _ = cfg.GetValue(goconfig.DEFAULT_SECTION, "StorageBaseSize")
 	c.Kernel, _ = cfg.GetValue(goconfig.DEFAULT_SECTION, "Kernel")
 	c.Initrd, _ = cfg.GetValue(goconfig.DEFAULT_SECTION, "Initrd")
 	c.Bridge, _ = cfg.GetValue(goconfig.DEFAULT_SECTION, "Bridge")