Skip to content

Fix canonicalization of layer IDs #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nalind merged 1 commit into from
Apr 19, 2017
Merged

Fix canonicalization of layer IDs #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 33 additions & 31 deletions storage/layers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,19 +619,35 @@ func (r *layerStore) Wipe() error {
return nil
}

func (r *layerStore) Changes(from, to string) ([]archive.Change, error) {
toLayer, ok := r.lookup(to)
func (r *layerStore) findParentAndLayer(from, to string) (fromID string, toID string, fromLayer *Layer, toLayer *Layer, err error) {
var ok bool
toLayer, ok = r.lookup(to)
if !ok {
return nil, ErrLayerUnknown
return "", "", nil, nil, ErrLayerUnknown
}
fromLayer, ok := r.lookup(from)
if !ok {
fromLayer, ok = r.lookup(toLayer.Parent)
to = toLayer.ID
Copy link
Member

@rhatdan rhatdan Apr 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this same block of code is copied three times, shouldn't we just add a new function to handle it?

Copy link
Member Author

@nalind nalind Apr 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that's a better idea. Fixing that.

if from == "" {
from = toLayer.Parent
}
if from != "" {
fromLayer, ok = r.lookup(from)
if !ok {
return nil, ErrParentUnknown
fromLayer, ok = r.lookup(toLayer.Parent)
if !ok {
return "", "", nil, nil, ErrParentUnknown
}
}
from = fromLayer.ID
}
return from, to, fromLayer, toLayer, nil
}

func (r *layerStore) Changes(from, to string) ([]archive.Change, error) {
from, to, _, _, err := r.findParentAndLayer(from, to)
if err != nil {
return nil, ErrLayerUnknown
}
return r.driver.Changes(toLayer.ID, fromLayer.ID)
return r.driver.Changes(to, from)
}

type simpleGetCloser struct {
Expand Down Expand Up @@ -666,17 +682,10 @@ func (r *layerStore) newFileGetter(id string) (drivers.FileGetCloser, error) {
func (r *layerStore) Diff(from, to string) (io.ReadCloser, error) {
var metadata storage.Unpacker

toLayer, ok := r.lookup(to)
if !ok {
from, to, _, toLayer, err := r.findParentAndLayer(from, to)
if err != nil {
return nil, ErrLayerUnknown
}
fromLayer, ok := r.lookup(from)
if !ok {
fromLayer, ok = r.lookup(toLayer.Parent)
if !ok {
return nil, ErrParentUnknown
}
}
compression := archive.Uncompressed
if cflag, ok := toLayer.Flags[compressionFlag]; ok {
if ctype, ok := cflag.(float64); ok {
Expand All @@ -685,8 +694,8 @@ func (r *layerStore) Diff(from, to string) (io.ReadCloser, error) {
compression = archive.Compression(ctype)
}
}
if fromLayer.ID != toLayer.Parent {
diff, err := r.driver.Diff(toLayer.ID, fromLayer.ID)
if from != toLayer.Parent {
diff, err := r.driver.Diff(to, from)
if err == nil && (compression != archive.Uncompressed) {
preader, pwriter := io.Pipe()
compressor, err := archive.CompressStream(pwriter, compression)
Expand All @@ -706,10 +715,10 @@ func (r *layerStore) Diff(from, to string) (io.ReadCloser, error) {
return diff, err
}

tsfile, err := os.Open(r.tspath(toLayer.ID))
tsfile, err := os.Open(r.tspath(to))
if err != nil {
if os.IsNotExist(err) {
return r.driver.Diff(toLayer.ID, fromLayer.ID)
return r.driver.Diff(to, from)
}
return nil, err
}
Expand Down Expand Up @@ -763,18 +772,11 @@ func (r *layerStore) Diff(from, to string) (io.ReadCloser, error) {
}

func (r *layerStore) DiffSize(from, to string) (size int64, err error) {
toLayer, ok := r.lookup(to)
if !ok {
from, to, _, _, err = r.findParentAndLayer(from, to)
if err != nil {
return -1, ErrLayerUnknown
}
fromLayer, ok := r.lookup(from)
if !ok {
fromLayer, ok = r.lookup(toLayer.Parent)
if !ok {
return -1, ErrParentUnknown
}
}
return r.driver.DiffSize(toLayer.ID, fromLayer.ID)
return r.driver.DiffSize(to, from)
}

func (r *layerStore) ApplyDiff(to string, diff archive.Reader) (size int64, err error) {
Expand Down