rawblock: support configurable rootfs/volume size

Signed-off-by: Peng Tao <bergwolf@gmail.com>

Author: bergwolf

daemon/daemon.go

@@ -172,8 +172,12 @@ func InitDockerCfg(mirrors []string, insecureRegistries []string, graphdriver, b
 	dockerCfg.GraphDriver = graphdriver
 	dockerCfg.Root = root
 	dockerCfg.TrustKeyPath = path.Join(root, "keys")
-	if graphdriver == "devicemapper" && basesize != "" {
-		dockerCfg.GraphOptions = append(dockerCfg.GraphOptions, fmt.Sprintf("dm.basesize=%s", basesize))
+	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

daemon/storage.go

@@ -506,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) {
@@ -524,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
 }
 
@@ -560,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

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))