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

Merge pull request #3785 from Random-Liu/support-disk-usage-windows

Browse Source 
Support disk usage in windows snapshot.
This commit is contained in:
Derek McGowan 2019-11-12 14:40:38 -08:00 committed by GitHub
commit a176179a08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
snapshots/overlay/overlay.go
View File

@ -165,9 +165,8 @@ func (o *snapshotter) Usage(ctx context.Context, key string) (snapshots.Usage, e
return snapshots.Usage{}, err return snapshots.Usage{}, err
} }
upperPath := o.upperPath(id)
if info.Kind == snapshots.KindActive { if info.Kind == snapshots.KindActive {
upperPath := o.upperPath(id)
du, err := fs.DiskUsage(ctx, upperPath) du, err := fs.DiskUsage(ctx, upperPath)
if err != nil { if err != nil {
// TODO(stevvooe): Consider not reporting an error in this case. // TODO(stevvooe): Consider not reporting an error in this case.

37
snapshots/windows/windows.go
View File

@ -125,17 +125,20 @@ func (s *snapshotter) Usage(ctx context.Context, key string) (snapshots.Usage, e
if err != nil { if err != nil {
return snapshots.Usage{}, err return snapshots.Usage{}, err
} }
defer t.Rollback() id, info, usage, err := storage.GetInfo(ctx, key)
t.Rollback() // transaction no longer needed at this point.
_, info, usage, err := storage.GetInfo(ctx, key)
if err != nil { if err != nil {
return snapshots.Usage{}, err return snapshots.Usage{}, err
} }
if info.Kind == snapshots.KindActive { if info.Kind == snapshots.KindActive {
du := fs.Usage{ path := s.getSnapshotDir(id)
Size: 0, du, err := fs.DiskUsage(ctx, path)
if err != nil {
return snapshots.Usage{}, err
} }
usage = snapshots.Usage(du) usage = snapshots.Usage(du)
} }
@ -173,20 +176,30 @@ func (s *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
if err != nil { if err != nil {
return err return err
} }
defer t.Rollback()
usage := fs.Usage{ defer func() {
Size: 0, if err != nil {
if rerr := t.Rollback(); rerr != nil {
log.G(ctx).WithError(rerr).Warn("failed to rollback transaction")
}
}
}()
// grab the existing id
id, _, _, err := storage.GetInfo(ctx, key)
if err != nil {
return err
}
usage, err := fs.DiskUsage(ctx, s.getSnapshotDir(id))
if err != nil {
return err
} }
if _, err = storage.CommitActive(ctx, key, name, snapshots.Usage(usage), opts...); err != nil { if _, err = storage.CommitActive(ctx, key, name, snapshots.Usage(usage), opts...); err != nil {
return errors.Wrap(err, "failed to commit snapshot") return errors.Wrap(err, "failed to commit snapshot")
} }
return t.Commit()
if err := t.Commit(); err != nil {
return err
}
return nil
} }
// Remove abandons the transaction identified by key. All resources // Remove abandons the transaction identified by key. All resources