add StorageBaseSize in hyperd config

Author: minzcmu

daemon/daemon.go

@@ -133,7 +133,7 @@ func NewDaemon(cfg *apitypes.HyperConfig) (*Daemon, error) {
 		return nil, err
 	}
 	daemon.Storage = stor
-	daemon.Storage.Init()
+	daemon.Storage.Init(cfg)
 
 	err = daemon.initRunV(cfg)
 	if err != nil {

daemon/storage.go

@@ -32,7 +32,7 @@ type Storage interface {
 	Type() string
 	RootPath() string
 
-	Init() error
+	Init(c *apitypes.HyperConfig) error
 	CleanUp() error
 
 	PrepareContainer(mountId, sharedDir string, readonly bool) (*runv.VolumeDescription, error)
@@ -103,14 +103,18 @@ func (dms *DevMapperStorage) RootPath() string {
 	return dms.rootPath
 }
 
-func (dms *DevMapperStorage) Init() error {
+func (dms *DevMapperStorage) Init(c *apitypes.HyperConfig) error {
+	size := storage.DEFAULT_DM_POOL_SIZE
+	if c.StorageBaseSize > 0 {
+		size = c.StorageBaseSize
+	}
 	dmPool := dm.DeviceMapper{
 		Datafile:         filepath.Join(utils.HYPER_ROOT, "lib") + "/data",
 		Metadatafile:     filepath.Join(utils.HYPER_ROOT, "lib") + "/metadata",
 		DataLoopFile:     storage.DEFAULT_DM_DATA_LOOP,
 		MetadataLoopFile: storage.DEFAULT_DM_META_LOOP,
 		PoolName:         dms.VolPoolName,
-		Size:             storage.DEFAULT_DM_POOL_SIZE,
+		Size:             size,
 	}
 	dms.DmPoolData = &dmPool
 	rand.Seed(time.Now().UnixNano())
@@ -289,7 +293,7 @@ func (a *AufsStorage) RootPath() string {
 	return a.rootPath
 }
 
-func (*AufsStorage) Init() error { return nil }
+func (*AufsStorage) Init(c *apitypes.HyperConfig) error { return nil }
 
 func (*AufsStorage) CleanUp() error { return nil }
 
@@ -361,7 +365,7 @@ func (o *OverlayFsStorage) RootPath() string {
 	return o.rootPath
 }
 
-func (*OverlayFsStorage) Init() error { return nil }
+func (*OverlayFsStorage) Init(c *apitypes.HyperConfig) error { return nil }
 
 func (*OverlayFsStorage) CleanUp() error { return nil }
 
@@ -437,7 +441,7 @@ func (s *BtrfsStorage) subvolumesDirID(id string) string {
 	return filepath.Join(s.RootPath(), "subvolumes", id)
 }
 
-func (*BtrfsStorage) Init() error { return nil }
+func (*BtrfsStorage) Init(c *apitypes.HyperConfig) error { return nil }
 
 func (*BtrfsStorage) CleanUp() error { return nil }
 
@@ -514,7 +518,7 @@ func (s *RawBlockStorage) RootPath() string {
 	return s.rootPath
 }
 
-func (s *RawBlockStorage) Init() error {
+func (s *RawBlockStorage) Init(c *apitypes.HyperConfig) error {
 	if err := os.MkdirAll(filepath.Join(s.RootPath(), "volumes"), 0700); err != nil {
 		return err
 	}
@@ -583,7 +587,7 @@ func (v *VBoxStorage) RootPath() string {
 	return v.rootPath
 }
 
-func (*VBoxStorage) Init() error { return nil }
+func (*VBoxStorage) Init(c *apitypes.HyperConfig) error { return nil }
 
 func (*VBoxStorage) CleanUp() error { return nil }
 

types/config.go

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