ba6b774aea
To smooth initial implementation, uploads were spooled to local file storage, validated, then pushed to remote storage. That approach was flawed in that it present easy clustering of registry services that share a remote storage backend. The original plan was to implement resumable hashes then implement remote upload storage. After some thought, it was found to be better to get remote spooling working, then optimize with resumable hashes. Moving to this approach has tradeoffs: after storing the complete upload remotely, the node must fetch the content and validate it before moving it to the final location. This can double bandwidth usage to the remote backend. Modifying the verification and upload code to store intermediate hashes should be trivial once the layer digest format has settled. The largest changes for users of the storage package (mostly the registry app) are the LayerService interface and the LayerUpload interface. The LayerService now takes qualified repository names to start and resume uploads. In corallry, the concept of LayerUploadState has been complete removed, exposing all aspects of that state as part of the LayerUpload object. The LayerUpload object has been modified to work as an io.WriteSeeker and includes a StartedAt time, to allow for upload timeout policies. Finish now only requires a digest, eliding the requirement for a size parameter. Resource cleanup has taken a turn for the better. Resources are cleaned up after successful uploads and during a cancel call. Admittedly, this is probably not completely where we want to be. It's recommend that we bolster this with a periodic driver utility script that scans for partial uploads and deletes the underlying data. As a small benefit, we can leave these around to better understand how and why these uploads are failing, at the cost of some extra disk space. Many other changes follow from the changes above. The webapp needs to be updated to meet the new interface requirements. Signed-off-by: Stephen J Day <stephen.day@docker.com>
159 lines
3.6 KiB
Go
159 lines
3.6 KiB
Go
package storage
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/docker/distribution/digest"
|
|
"github.com/docker/distribution/manifest"
|
|
"github.com/docker/distribution/storagedriver/inmemory"
|
|
"github.com/docker/libtrust"
|
|
)
|
|
|
|
func TestManifestStorage(t *testing.T) {
|
|
driver := inmemory.New()
|
|
ms := &manifestStore{
|
|
driver: driver,
|
|
pathMapper: &pathMapper{
|
|
root: "/storage/testing",
|
|
version: storagePathVersion,
|
|
},
|
|
layerService: newMockedLayerService(),
|
|
}
|
|
|
|
name := "foo/bar"
|
|
tag := "thetag"
|
|
|
|
exists, err := ms.Exists(name, tag)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error checking manifest existence: %v", err)
|
|
}
|
|
|
|
if exists {
|
|
t.Fatalf("manifest should not exist")
|
|
}
|
|
|
|
if _, err := ms.Get(name, tag); true {
|
|
switch err.(type) {
|
|
case ErrUnknownManifest:
|
|
break
|
|
default:
|
|
t.Fatalf("expected manifest unknown error: %#v", err)
|
|
}
|
|
}
|
|
|
|
m := manifest.Manifest{
|
|
Versioned: manifest.Versioned{
|
|
SchemaVersion: 1,
|
|
},
|
|
Name: name,
|
|
Tag: tag,
|
|
FSLayers: []manifest.FSLayer{
|
|
{
|
|
BlobSum: "asdf",
|
|
},
|
|
{
|
|
BlobSum: "qwer",
|
|
},
|
|
},
|
|
}
|
|
|
|
pk, err := libtrust.GenerateECP256PrivateKey()
|
|
if err != nil {
|
|
t.Fatalf("unexpected error generating private key: %v", err)
|
|
}
|
|
|
|
sm, err := manifest.Sign(&m, pk)
|
|
if err != nil {
|
|
t.Fatalf("error signing manifest: %v", err)
|
|
}
|
|
|
|
err = ms.Put(name, tag, sm)
|
|
if err == nil {
|
|
t.Fatalf("expected errors putting manifest")
|
|
}
|
|
|
|
// TODO(stevvooe): We expect errors describing all of the missing layers.
|
|
|
|
ms.layerService.(*mockedExistenceLayerService).add(name, "asdf")
|
|
ms.layerService.(*mockedExistenceLayerService).add(name, "qwer")
|
|
|
|
if err = ms.Put(name, tag, sm); err != nil {
|
|
t.Fatalf("unexpected error putting manifest: %v", err)
|
|
}
|
|
|
|
exists, err = ms.Exists(name, tag)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error checking manifest existence: %v", err)
|
|
}
|
|
|
|
if !exists {
|
|
t.Fatalf("manifest should exist")
|
|
}
|
|
|
|
fetchedManifest, err := ms.Get(name, tag)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error fetching manifest: %v", err)
|
|
}
|
|
|
|
if !reflect.DeepEqual(fetchedManifest, sm) {
|
|
t.Fatalf("fetched manifest not equal: %#v != %#v", fetchedManifest, sm)
|
|
}
|
|
|
|
// Grabs the tags and check that this tagged manifest is present
|
|
tags, err := ms.Tags(name)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error fetching tags: %v", err)
|
|
}
|
|
|
|
if len(tags) != 1 {
|
|
t.Fatalf("unexpected tags returned: %v", tags)
|
|
}
|
|
|
|
if tags[0] != tag {
|
|
t.Fatalf("unexpected tag found in tags: %v != %v", tags, []string{tag})
|
|
}
|
|
}
|
|
|
|
type layerKey struct {
|
|
name string
|
|
digest digest.Digest
|
|
}
|
|
|
|
type mockedExistenceLayerService struct {
|
|
exists map[layerKey]struct{}
|
|
}
|
|
|
|
func newMockedLayerService() *mockedExistenceLayerService {
|
|
return &mockedExistenceLayerService{
|
|
exists: make(map[layerKey]struct{}),
|
|
}
|
|
}
|
|
|
|
var _ LayerService = &mockedExistenceLayerService{}
|
|
|
|
func (mels *mockedExistenceLayerService) add(name string, digest digest.Digest) {
|
|
mels.exists[layerKey{name: name, digest: digest}] = struct{}{}
|
|
}
|
|
|
|
func (mels *mockedExistenceLayerService) remove(name string, digest digest.Digest) {
|
|
delete(mels.exists, layerKey{name: name, digest: digest})
|
|
}
|
|
|
|
func (mels *mockedExistenceLayerService) Exists(name string, digest digest.Digest) (bool, error) {
|
|
_, ok := mels.exists[layerKey{name: name, digest: digest}]
|
|
return ok, nil
|
|
}
|
|
|
|
func (mockedExistenceLayerService) Fetch(name string, digest digest.Digest) (Layer, error) {
|
|
panic("not implemented")
|
|
}
|
|
|
|
func (mockedExistenceLayerService) Upload(name string) (LayerUpload, error) {
|
|
panic("not implemented")
|
|
}
|
|
|
|
func (mockedExistenceLayerService) Resume(name, uuid string) (LayerUpload, error) {
|
|
panic("not implemented")
|
|
}
|