github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

devmapper: don't create or reload thin-pool from snapshotter

Browse Source 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
This commit is contained in:
Maksym Pavlenko
2019-02-21 15:55:01 -08:00
parent 7efda48c53
commit adf5c640f4
5 changed files with 33 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
snapshots/devmapper/config.go
View File

@@ -23,23 +23,11 @@ import (
"os"
"github.com/BurntSushi/toml"
"github.com/containerd/containerd/snapshots/devmapper/dmsetup"
"github.com/docker/go-units"
"github.com/hashicorp/go-multierror"
"github.com/pkg/errors"
)
const (
// See https://www.kernel.org/doc/Documentation/device-mapper/thin-provisioning.txt for details
dataBlockMinSize = 128
dataBlockMaxSize = 2097152
)
var (
errInvalidBlockSize = errors.Errorf("block size should be between %d and %d", dataBlockMinSize, dataBlockMaxSize)
errInvalidBlockAlignment = errors.Errorf("block size should be multiple of %d sectors", dataBlockMinSize)
)
// Config represents device mapper configuration loaded from file.
// Size units can be specified in human-readable string format (like "32KIB", "32GB", "32Tb")
type Config struct {
@@ -49,19 +37,6 @@ type Config struct {
// Name for 'thin-pool' device to be used by snapshotter (without /dev/mapper/ prefix)
PoolName string `toml:"pool_name"`
// Path to data volume to be used by thin-pool
DataDevice string `toml:"data_device"`
// Path to metadata volume to be used by thin-pool
MetadataDevice string `toml:"meta_device"`
// The size of allocation chunks in data file.
// Must be between 128 sectors (64KB) and 2097152 sectors (1GB) and a multiple of 128 sectors (64KB)
// Block size can't be changed after pool created.
// See https://www.kernel.org/doc/Documentation/device-mapper/thin-provisioning.txt
DataBlockSize string `toml:"data_block_size"`
DataBlockSizeSectors uint32 `toml:"-"`
// Defines how much space to allocate when creating base image for container
BaseImageSize string `toml:"base_image_size"`
BaseImageSizeBytes uint64 `toml:"-"`
@@ -94,23 +69,13 @@ func LoadConfig(path string) (*Config, error) {
}
func (c *Config) parse() error {
var result *multierror.Error
if c.DataBlockSize != "" {
if blockSize, err := units.RAMInBytes(c.DataBlockSize); err != nil {
result = multierror.Append(result, errors.Wrapf(err, "failed to parse data block size: %q", c.DataBlockSize))
} else {
c.DataBlockSizeSectors = uint32(blockSize / dmsetup.SectorSize)
}
baseImageSize, err := units.RAMInBytes(c.BaseImageSize)
if err != nil {
return errors.Wrapf(err, "failed to parse base image size: '%s'", c.BaseImageSize)
}
if baseImageSize, err := units.RAMInBytes(c.BaseImageSize); err != nil {
result = multierror.Append(result, errors.Wrapf(err, "failed to parse base image size: %q", c.BaseImageSize))
} else {
c.BaseImageSizeBytes = uint64(baseImageSize)
}
return result.ErrorOrNil()
c.BaseImageSizeBytes = uint64(baseImageSize)
return nil
}
// Validate makes sure configuration fields are valid
@@ -129,32 +94,5 @@ func (c *Config) Validate() error {
result = multierror.Append(result, fmt.Errorf("base_image_size is required"))
}
// The following fields are required only if we want to create or reload pool.
// Otherwise existing pool with 'PoolName' (prepared in advance) can be used by snapshotter.
if c.DataDevice != "" || c.MetadataDevice != "" || c.DataBlockSize != "" || c.DataBlockSizeSectors != 0 {
strChecks := []struct {
field string
name string
}{
{c.DataDevice, "data_device"},
{c.MetadataDevice, "meta_device"},
{c.DataBlockSize, "data_block_size"},
}
for _, check := range strChecks {
if check.field == "" {
result = multierror.Append(result, errors.Errorf("%s is empty", check.name))
}
}
if c.DataBlockSizeSectors < dataBlockMinSize || c.DataBlockSizeSectors > dataBlockMaxSize {
result = multierror.Append(result, errInvalidBlockSize)
}
if c.DataBlockSizeSectors%dataBlockMinSize != 0 {
result = multierror.Append(result, errInvalidBlockAlignment)
}
}
return result.ErrorOrNil()
}