782fe1fe82
The only use is in `builder/builder-next/adapters/snapshot.EnsureLayer()`, which always calls the function with an _empty_ `oldTarDataPath`;7082aecd54/builder/builder-next/adapters/snapshot/layer.go (L81)
When called with an empty `oldTarDataPath`, this function was an alias for `checksumForGraphIDNoTarsplit`, so let's make it that. Note that this code was added in500e77bad0
, as part of the migration from "v1" images to "v2" (content-addressable) images. Given that the remaining code lives in a "migration" file, possibly more code can be removed. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
157 lines
3.3 KiB
Go
157 lines
3.3 KiB
Go
package layer // import "github.com/docker/docker/layer"
|
|
|
|
import (
|
|
"compress/gzip"
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"os"
|
|
|
|
"github.com/containerd/log"
|
|
"github.com/opencontainers/go-digest"
|
|
"github.com/vbatts/tar-split/tar/asm"
|
|
"github.com/vbatts/tar-split/tar/storage"
|
|
)
|
|
|
|
func (ls *layerStore) ChecksumForGraphID(id, parent, newTarDataPath string) (diffID DiffID, size int64, err error) {
|
|
rawarchive, err := ls.driver.Diff(id, parent)
|
|
if err != nil {
|
|
return
|
|
}
|
|
defer rawarchive.Close()
|
|
|
|
f, err := os.Create(newTarDataPath)
|
|
if err != nil {
|
|
return
|
|
}
|
|
defer f.Close()
|
|
mfz := gzip.NewWriter(f)
|
|
defer mfz.Close()
|
|
metaPacker := storage.NewJSONPacker(mfz)
|
|
|
|
packerCounter := &packSizeCounter{metaPacker, &size}
|
|
|
|
archive, err := asm.NewInputTarStream(rawarchive, packerCounter, nil)
|
|
if err != nil {
|
|
return
|
|
}
|
|
dgst, err := digest.FromReader(archive)
|
|
if err != nil {
|
|
return
|
|
}
|
|
diffID = DiffID(dgst)
|
|
return
|
|
}
|
|
|
|
func (ls *layerStore) RegisterByGraphID(graphID string, parent ChainID, diffID DiffID, tarDataFile string, size int64) (Layer, error) {
|
|
// err is used to hold the error which will always trigger
|
|
// cleanup of creates sources but may not be an error returned
|
|
// to the caller (already exists).
|
|
var err error
|
|
var p *roLayer
|
|
if string(parent) != "" {
|
|
ls.layerL.Lock()
|
|
p = ls.get(parent)
|
|
ls.layerL.Unlock()
|
|
if p == nil {
|
|
return nil, ErrLayerDoesNotExist
|
|
}
|
|
|
|
// Release parent chain if error
|
|
defer func() {
|
|
if err != nil {
|
|
ls.layerL.Lock()
|
|
ls.releaseLayer(p)
|
|
ls.layerL.Unlock()
|
|
}
|
|
}()
|
|
}
|
|
|
|
// Create new roLayer
|
|
layer := &roLayer{
|
|
parent: p,
|
|
cacheID: graphID,
|
|
referenceCount: 1,
|
|
layerStore: ls,
|
|
references: map[Layer]struct{}{},
|
|
diffID: diffID,
|
|
size: size,
|
|
chainID: createChainIDFromParent(parent, diffID),
|
|
}
|
|
|
|
ls.layerL.Lock()
|
|
defer ls.layerL.Unlock()
|
|
|
|
if existingLayer := ls.get(layer.chainID); existingLayer != nil {
|
|
// Set error for cleanup, but do not return
|
|
err = errors.New("layer already exists")
|
|
return existingLayer.getReference(), nil
|
|
}
|
|
|
|
tx, err := ls.store.StartTransaction()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
defer func() {
|
|
if err != nil {
|
|
log.G(context.TODO()).Debugf("Cleaning up transaction after failed migration for %s: %v", graphID, err)
|
|
if err := tx.Cancel(); err != nil {
|
|
log.G(context.TODO()).Errorf("Error canceling metadata transaction %q: %s", tx.String(), err)
|
|
}
|
|
}
|
|
}()
|
|
|
|
tsw, err := tx.TarSplitWriter(false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer tsw.Close()
|
|
tdf, err := os.Open(tarDataFile)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer tdf.Close()
|
|
_, err = io.Copy(tsw, tdf)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err = storeLayer(tx, layer); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err = tx.Commit(layer.chainID); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ls.layerMap[layer.chainID] = layer
|
|
|
|
return layer.getReference(), nil
|
|
}
|
|
|
|
type unpackSizeCounter struct {
|
|
unpacker storage.Unpacker
|
|
size *int64
|
|
}
|
|
|
|
func (u *unpackSizeCounter) Next() (*storage.Entry, error) {
|
|
e, err := u.unpacker.Next()
|
|
if err == nil && u.size != nil {
|
|
*u.size += e.Size
|
|
}
|
|
return e, err
|
|
}
|
|
|
|
type packSizeCounter struct {
|
|
packer storage.Packer
|
|
size *int64
|
|
}
|
|
|
|
func (p *packSizeCounter) AddEntry(e storage.Entry) (int, error) {
|
|
n, err := p.packer.AddEntry(e)
|
|
if err == nil && p.size != nil {
|
|
*p.size += e.Size
|
|
}
|
|
return n, err
|
|
}
|