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

snapshot/devmapper: log exported methods correctly

Browse Source 
- View was somehow logging itself as "prepare"
- Cleanup should have its debug log as like other exported methods

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato 2021-06-24 16:14:45 -07:00
parent c8c6eed932
commit 03ee450060
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snapshots/devmapper/snapshotter.go
View File

@ -204,7 +204,7 @@ func (s *Snapshotter) Prepare(ctx context.Context, key, parent string, opts ...s
// View creates readonly thin device for the given snapshot key // View creates readonly thin device for the given snapshot key
func (s *Snapshotter) View(ctx context.Context, key, parent string, opts ...snapshots.Opt) ([]mount.Mount, error) { func (s *Snapshotter) View(ctx context.Context, key, parent string, opts ...snapshots.Opt) ([]mount.Mount, error) {
log.G(ctx).WithFields(logrus.Fields{"key": key, "parent": parent}).Debug("prepare") log.G(ctx).WithFields(logrus.Fields{"key": key, "parent": parent}).Debug("view")
var ( var (
mounts []mount.Mount mounts []mount.Mount
@ -490,6 +490,8 @@ func (s *Snapshotter) withTransaction(ctx context.Context, writable bool, fn fun
// Cleanup cleans up all removed and unused resources // Cleanup cleans up all removed and unused resources
func (s *Snapshotter) Cleanup(ctx context.Context) error { func (s *Snapshotter) Cleanup(ctx context.Context) error {
log.G(ctx).Debug("cleanup")
var removedDevices []*DeviceInfo var removedDevices []*DeviceInfo
if !s.config.AsyncRemove { if !s.config.AsyncRemove {