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

Enable lazy init for ext4 with devicemapper

Browse Source 
Add file system options for config file, so that user can use
non-default file system parameters for the fs type of choice
Using file system options in config file overwrites the default
options already being used.

Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
This commit is contained in:
Alakesh Haloi
2021-10-13 15:29:43 -07:00
parent 753f95e23f
commit dc13bcd51e
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
snapshots/devmapper/snapshotter.go
View File

@@ -403,6 +403,7 @@ func (s *Snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
}
if len(snap.ParentIDs) == 0 {
fsOptions := ""
deviceName := s.getDeviceName(snap.ID)
log.G(ctx).Debugf("creating new thin device '%s'", deviceName)
@@ -412,7 +413,14 @@ func (s *Snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
return nil, err
}
if err := mkfs(ctx, s.config.FileSystemType, dmsetup.GetFullDevicePath(deviceName)); err != nil {
if s.config.FileSystemType == fsTypeExt4 && s.config.FsOptions == "" {
// Explicitly disable lazy_itable_init and lazy_journal_init in order to enable lazy initialization.
fsOptions = "nodiscard,lazy_itable_init=0,lazy_journal_init=0"
} else {
fsOptions = s.config.FsOptions
}
log.G(ctx).Debugf("Creating file system of type: %s with options: %s for thin device %q", s.config.FileSystemType, fsOptions, deviceName)
if err := mkfs(ctx, s.config.FileSystemType, fsOptions, dmsetup.GetFullDevicePath(deviceName)); err != nil {
status, sErr := dmsetup.Status(s.pool.poolName)
if sErr != nil {
multierror.Append(err, sErr)
@@ -448,7 +456,7 @@ func (s *Snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
// mkfs creates filesystem on the given devmapper device based on type
// specified in config.
func mkfs(ctx context.Context, fs fsType, path string) error {
func mkfs(ctx context.Context, fs fsType, fsOptions string, path string) error {
mkfsCommand := ""
var args []string
@@ -457,8 +465,7 @@ func mkfs(ctx context.Context, fs fsType, path string) error {
mkfsCommand = "mkfs.ext4"
args = []string{
"-E",
// We don't want any zeroing in advance when running mkfs on thin devices (see "man mkfs.ext4")
"nodiscard,lazy_itable_init=0,lazy_journal_init=0",
fsOptions,
path,
}
case fsTypeXFS: