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

Merge pull request #755 from miaoyq/avoid-creating-snapshots-repeatedly

Browse Source 
Avoid creating snapshots repeatedly
This commit is contained in:
Stephen Day 2017-04-26 15:02:14 -05:00 committed by GitHub
commit d0c7f13e39
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rootfs/apply.go
View File

@ -71,7 +71,7 @@ func ApplyLayer(snapshots snapshot.Snapshotter, mounter Mounter, rd io.Reader, p
digester := digest.Canonical.Digester() // used to calculate diffID. digester := digest.Canonical.Digester() // used to calculate diffID.
rd = io.TeeReader(rd, digester.Hash()) rd = io.TeeReader(rd, digester.Hash())
if _, err := archive.Apply(context.Background(), key, rd); err != nil { if _, err := archive.Apply(context.Background(), dir, rd); err != nil {
return "", err return "", err
} }
@ -82,7 +82,7 @@ func ApplyLayer(snapshots snapshot.Snapshotter, mounter Mounter, rd io.Reader, p
chainID = identity.ChainID([]digest.Digest{parent, chainID}) chainID = identity.ChainID([]digest.Digest{parent, chainID})
} }
if _, err := snapshots.Stat(ctx, chainID.String()); err == nil { if _, err := snapshots.Stat(ctx, chainID.String()); err == nil {
return diffID, nil //TODO: call snapshots.Remove(ctx, key) once implemented return diffID, snapshots.Remove(ctx, key)
} }
return diffID, snapshots.Commit(ctx, chainID.String(), key) return diffID, snapshots.Commit(ctx, chainID.String(), key)