kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

graphdriver/*: expect uncompressed tar for ApplyDiff

Browse source 
The `ApplyDiff` function takes a tar archive stream that is
automagically decompressed later. This was causing a double
decompression, and when the layer was empty, that causes an early EOF.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
This commit is contained in:
Vincent Batts 2015-07-27 13:23:52 -04:00
parent 56bf275e32
commit 273f50c741
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/graphdriver/aufs/aufs.go
View file

@ -323,7 +323,7 @@ func (a *Driver) Diff(id, parent string) (archive.Archive, error) {
} }
func (a *Driver) applyDiff(id string, diff archive.ArchiveReader) error { func (a *Driver) applyDiff(id string, diff archive.ArchiveReader) error {
return chrootarchive.Untar(diff, path.Join(a.rootPath(), "diff", id), nil) return chrootarchive.UntarUncompressed(diff, path.Join(a.rootPath(), "diff", id), nil)
} }
// DiffSize calculates the changes between the specified id // DiffSize calculates the changes between the specified id

1
daemon/graphdriver/driver.go
View file

@ -77,6 +77,7 @@ type Driver interface {
// ApplyDiff extracts the changeset from the given diff into the // ApplyDiff extracts the changeset from the given diff into the
// layer with the specified id and parent, returning the size of the // layer with the specified id and parent, returning the size of the
// new layer in bytes. // new layer in bytes.
// The archive.ArchiveReader must be an uncompressed stream.
ApplyDiff(id, parent string, diff archive.ArchiveReader) (size int64, err error) ApplyDiff(id, parent string, diff archive.ArchiveReader) (size int64, err error)
// DiffSize calculates the changes between the specified id // DiffSize calculates the changes between the specified id
// and its parent and returns the size in bytes of the changes // and its parent and returns the size in bytes of the changes

2
daemon/graphdriver/fsdiff.go
View file

@ -121,7 +121,7 @@ func (gdw *naiveDiffDriver) ApplyDiff(id, parent string, diff archive.ArchiveRea
start := time.Now().UTC() start := time.Now().UTC()
logrus.Debugf("Start untar layer") logrus.Debugf("Start untar layer")
if size, err = chrootarchive.ApplyLayer(layerFs, diff); err != nil { if size, err = chrootarchive.ApplyUncompressedLayer(layerFs, diff); err != nil {
return return
} }
logrus.Debugf("Untar time: %vs", time.Now().UTC().Sub(start).Seconds()) logrus.Debugf("Untar time: %vs", time.Now().UTC().Sub(start).Seconds())

2
daemon/graphdriver/overlay/overlay.go
View file

@ -411,7 +411,7 @@ func (d *Driver) ApplyDiff(id string, parent string, diff archive.ArchiveReader)
return 0, err return 0, err
} }
if size, err = chrootarchive.ApplyLayer(tmpRootDir, diff); err != nil { if size, err = chrootarchive.ApplyUncompressedLayer(tmpRootDir, diff); err != nil {
return 0, err return 0, err
} }