2015-02-11 02:41:09 +01:00
|
|
|
package storage
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"io"
|
|
|
|
"reflect"
|
|
|
|
"testing"
|
|
|
|
|
2015-02-13 22:59:50 +01:00
|
|
|
"github.com/docker/distribution"
|
Refactor Blob Service API
This PR refactors the blob service API to be oriented around blob descriptors.
Identified by digests, blobs become an abstract entity that can be read and
written using a descriptor as a handle. This allows blobs to take many forms,
such as a ReadSeekCloser or a simple byte buffer, allowing blob oriented
operations to better integrate with blob agnostic APIs (such as the `io`
package). The error definitions are now better organized to reflect conditions
that can only be seen when interacting with the blob API.
The main benefit of this is to separate the much smaller metadata from large
file storage. Many benefits also follow from this. Reading and writing has
been separated into discrete services. Backend implementation is also
simplified, by reducing the amount of metadata that needs to be picked up to
simply serve a read. This also improves cacheability.
"Opening" a blob simply consists of an access check (Stat) and a path
calculation. Caching is greatly simplified and we've made the mapping of
provisional to canonical hashes a first-class concept. BlobDescriptorService
and BlobProvider can be combined in different ways to achieve varying effects.
Recommend Review Approach
-------------------------
This is a very large patch. While apologies are in order, we are getting a
considerable amount of refactoring. Most changes follow from the changes to
the root package (distribution), so start there. From there, the main changes
are in storage. Looking at (*repository).Blobs will help to understand the how
the linkedBlobStore is wired. One can explore the internals within and also
branch out into understanding the changes to the caching layer. Following the
descriptions below will also help to guide you.
To reduce the chances for regressions, it was critical that major changes to
unit tests were avoided. Where possible, they are left untouched and where
not, the spirit is hopefully captured. Pay particular attention to where
behavior may have changed.
Storage
-------
The primary changes to the `storage` package, other than the interface
updates, were to merge the layerstore and blobstore. Blob access is now
layered even further. The first layer, blobStore, exposes a global
`BlobStatter` and `BlobProvider`. Operations here provide a fast path for most
read operations that don't take access control into account. The
`linkedBlobStore` layers on top of the `blobStore`, providing repository-
scoped blob link management in the backend. The `linkedBlobStore` implements
the full `BlobStore` suite, providing access-controlled, repository-local blob
writers. The abstraction between the two is slightly broken in that
`linkedBlobStore` is the only channel under which one can write into the global
blob store. The `linkedBlobStore` also provides flexibility in that it can act
over different link sets depending on configuration. This allows us to use the
same code for signature links, manifest links and blob links. Eventually, we
will fully consolidate this storage.
The improved cache flow comes from the `linkedBlobStatter` component
of `linkedBlobStore`. Using a `cachedBlobStatter`, these combine together to
provide a simple cache hierarchy that should streamline access checks on read
and write operations, or at least provide a single path to optimize. The
metrics have been changed in a slightly incompatible way since the former
operations, Fetch and Exists, are no longer relevant.
The fileWriter and fileReader have been slightly modified to support the rest
of the changes. The most interesting is the removal of the `Stat` call from
`newFileReader`. This was the source of unnecessary round trips that were only
present to look up the size of the resulting reader. Now, one must simply pass
in the size, requiring the caller to decide whether or not the `Stat` call is
appropriate. In several cases, it turned out the caller already had the size
already. The `WriterAt` implementation has been removed from `fileWriter`,
since it is no longer required for `BlobWriter`, reducing the number of paths
which writes may take.
Cache
-----
Unfortunately, the `cache` package required a near full rewrite. It was pretty
mechanical in that the cache is oriented around the `BlobDescriptorService`
slightly modified to include the ability to set the values for individual
digests. While the implementation is oriented towards caching, it can act as a
primary store. Provisions are in place to have repository local metadata, in
addition to global metadata. Fallback is implemented as a part of the storage
package to maintain this flexibility.
One unfortunate side-effect is that caching is now repository-scoped, rather
than global. This should have little effect on performance but may increase
memory usage.
Handlers
--------
The `handlers` package has been updated to leverage the new API. For the most
part, the changes are superficial or mechanical based on the API changes. This
did expose a bug in the handling of provisional vs canonical digests that was
fixed in the unit tests.
Configuration
-------------
One user-facing change has been made to the configuration and is updated in
the associated documentation. The `layerinfo` cache parameter has been
deprecated by the `blobdescriptor` cache parameter. Both are equivalent and
configuration files should be backward compatible.
Notifications
-------------
Changes the `notification` package are simply to support the interface
changes.
Context
-------
A small change has been made to the tracing log-level. Traces have been moved
from "info" to "debug" level to reduce output when not needed.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-05-12 09:10:29 +02:00
|
|
|
"github.com/docker/distribution/context"
|
2015-02-11 02:41:09 +01:00
|
|
|
"github.com/docker/distribution/digest"
|
|
|
|
"github.com/docker/distribution/manifest"
|
2015-08-21 06:24:30 +02:00
|
|
|
"github.com/docker/distribution/manifest/schema1"
|
2015-05-21 02:12:40 +02:00
|
|
|
"github.com/docker/distribution/registry/storage/cache/memory"
|
2015-02-27 00:47:04 +01:00
|
|
|
"github.com/docker/distribution/registry/storage/driver"
|
2015-02-11 03:14:23 +01:00
|
|
|
"github.com/docker/distribution/registry/storage/driver/inmemory"
|
2015-02-11 02:41:09 +01:00
|
|
|
"github.com/docker/distribution/testutil"
|
|
|
|
"github.com/docker/libtrust"
|
|
|
|
)
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
type manifestStoreTestEnv struct {
|
|
|
|
ctx context.Context
|
|
|
|
driver driver.StorageDriver
|
2015-04-10 04:21:33 +02:00
|
|
|
registry distribution.Namespace
|
2015-02-27 00:47:04 +01:00
|
|
|
repository distribution.Repository
|
|
|
|
name string
|
|
|
|
tag string
|
|
|
|
}
|
|
|
|
|
|
|
|
func newManifestStoreTestEnv(t *testing.T, name, tag string) *manifestStoreTestEnv {
|
2015-02-11 02:41:09 +01:00
|
|
|
ctx := context.Background()
|
|
|
|
driver := inmemory.New()
|
2015-08-18 19:56:27 +02:00
|
|
|
registry, err := NewRegistry(ctx, driver, BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), EnableDelete, EnableRedirect)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error creating registry: %v", err)
|
|
|
|
}
|
2015-07-24 08:16:27 +02:00
|
|
|
|
2015-02-13 22:59:50 +01:00
|
|
|
repo, err := registry.Repository(ctx, name)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error getting repo: %v", err)
|
|
|
|
}
|
2015-02-11 02:41:09 +01:00
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
return &manifestStoreTestEnv{
|
|
|
|
ctx: ctx,
|
|
|
|
driver: driver,
|
|
|
|
registry: registry,
|
|
|
|
repository: repo,
|
|
|
|
name: name,
|
|
|
|
tag: tag,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestManifestStorage(t *testing.T) {
|
|
|
|
env := newManifestStoreTestEnv(t, "foo/bar", "thetag")
|
2015-06-15 19:39:34 +02:00
|
|
|
ctx := context.Background()
|
|
|
|
ms, err := env.repository.Manifests(ctx)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-02-27 00:47:04 +01:00
|
|
|
|
|
|
|
exists, err := ms.ExistsByTag(env.tag)
|
2015-02-11 02:41:09 +01:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error checking manifest existence: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if exists {
|
|
|
|
t.Fatalf("manifest should not exist")
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
if _, err := ms.GetByTag(env.tag); true {
|
2015-02-11 02:41:09 +01:00
|
|
|
switch err.(type) {
|
2015-02-13 22:59:50 +01:00
|
|
|
case distribution.ErrManifestUnknown:
|
2015-02-11 02:41:09 +01:00
|
|
|
break
|
|
|
|
default:
|
|
|
|
t.Fatalf("expected manifest unknown error: %#v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-21 06:24:30 +02:00
|
|
|
m := schema1.Manifest{
|
2015-02-11 02:41:09 +01:00
|
|
|
Versioned: manifest.Versioned{
|
|
|
|
SchemaVersion: 1,
|
|
|
|
},
|
2015-02-27 00:47:04 +01:00
|
|
|
Name: env.name,
|
|
|
|
Tag: env.tag,
|
2015-02-11 02:41:09 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Build up some test layers and add them to the manifest, saving the
|
|
|
|
// readseekers for upload later.
|
|
|
|
testLayers := map[digest.Digest]io.ReadSeeker{}
|
|
|
|
for i := 0; i < 2; i++ {
|
|
|
|
rs, ds, err := testutil.CreateRandomTarFile()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error generating test layer file")
|
|
|
|
}
|
|
|
|
dgst := digest.Digest(ds)
|
|
|
|
|
|
|
|
testLayers[digest.Digest(dgst)] = rs
|
2015-08-21 06:24:30 +02:00
|
|
|
m.FSLayers = append(m.FSLayers, schema1.FSLayer{
|
2015-02-11 02:41:09 +01:00
|
|
|
BlobSum: dgst,
|
|
|
|
})
|
2015-11-03 20:03:17 +01:00
|
|
|
m.History = append(m.History, schema1.History{
|
|
|
|
V1Compatibility: "",
|
|
|
|
})
|
|
|
|
|
2015-02-11 02:41:09 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
pk, err := libtrust.GenerateECP256PrivateKey()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error generating private key: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-08-21 06:24:30 +02:00
|
|
|
sm, merr := schema1.Sign(&m, pk)
|
2015-06-15 19:39:34 +02:00
|
|
|
if merr != nil {
|
2015-02-11 02:41:09 +01:00
|
|
|
t.Fatalf("error signing manifest: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
err = ms.Put(sm)
|
2015-02-11 02:41:09 +01:00
|
|
|
if err == nil {
|
2015-06-15 19:39:34 +02:00
|
|
|
t.Fatalf("expected errors putting manifest with full verification")
|
2015-02-11 02:41:09 +01:00
|
|
|
}
|
|
|
|
|
Refactor Blob Service API
This PR refactors the blob service API to be oriented around blob descriptors.
Identified by digests, blobs become an abstract entity that can be read and
written using a descriptor as a handle. This allows blobs to take many forms,
such as a ReadSeekCloser or a simple byte buffer, allowing blob oriented
operations to better integrate with blob agnostic APIs (such as the `io`
package). The error definitions are now better organized to reflect conditions
that can only be seen when interacting with the blob API.
The main benefit of this is to separate the much smaller metadata from large
file storage. Many benefits also follow from this. Reading and writing has
been separated into discrete services. Backend implementation is also
simplified, by reducing the amount of metadata that needs to be picked up to
simply serve a read. This also improves cacheability.
"Opening" a blob simply consists of an access check (Stat) and a path
calculation. Caching is greatly simplified and we've made the mapping of
provisional to canonical hashes a first-class concept. BlobDescriptorService
and BlobProvider can be combined in different ways to achieve varying effects.
Recommend Review Approach
-------------------------
This is a very large patch. While apologies are in order, we are getting a
considerable amount of refactoring. Most changes follow from the changes to
the root package (distribution), so start there. From there, the main changes
are in storage. Looking at (*repository).Blobs will help to understand the how
the linkedBlobStore is wired. One can explore the internals within and also
branch out into understanding the changes to the caching layer. Following the
descriptions below will also help to guide you.
To reduce the chances for regressions, it was critical that major changes to
unit tests were avoided. Where possible, they are left untouched and where
not, the spirit is hopefully captured. Pay particular attention to where
behavior may have changed.
Storage
-------
The primary changes to the `storage` package, other than the interface
updates, were to merge the layerstore and blobstore. Blob access is now
layered even further. The first layer, blobStore, exposes a global
`BlobStatter` and `BlobProvider`. Operations here provide a fast path for most
read operations that don't take access control into account. The
`linkedBlobStore` layers on top of the `blobStore`, providing repository-
scoped blob link management in the backend. The `linkedBlobStore` implements
the full `BlobStore` suite, providing access-controlled, repository-local blob
writers. The abstraction between the two is slightly broken in that
`linkedBlobStore` is the only channel under which one can write into the global
blob store. The `linkedBlobStore` also provides flexibility in that it can act
over different link sets depending on configuration. This allows us to use the
same code for signature links, manifest links and blob links. Eventually, we
will fully consolidate this storage.
The improved cache flow comes from the `linkedBlobStatter` component
of `linkedBlobStore`. Using a `cachedBlobStatter`, these combine together to
provide a simple cache hierarchy that should streamline access checks on read
and write operations, or at least provide a single path to optimize. The
metrics have been changed in a slightly incompatible way since the former
operations, Fetch and Exists, are no longer relevant.
The fileWriter and fileReader have been slightly modified to support the rest
of the changes. The most interesting is the removal of the `Stat` call from
`newFileReader`. This was the source of unnecessary round trips that were only
present to look up the size of the resulting reader. Now, one must simply pass
in the size, requiring the caller to decide whether or not the `Stat` call is
appropriate. In several cases, it turned out the caller already had the size
already. The `WriterAt` implementation has been removed from `fileWriter`,
since it is no longer required for `BlobWriter`, reducing the number of paths
which writes may take.
Cache
-----
Unfortunately, the `cache` package required a near full rewrite. It was pretty
mechanical in that the cache is oriented around the `BlobDescriptorService`
slightly modified to include the ability to set the values for individual
digests. While the implementation is oriented towards caching, it can act as a
primary store. Provisions are in place to have repository local metadata, in
addition to global metadata. Fallback is implemented as a part of the storage
package to maintain this flexibility.
One unfortunate side-effect is that caching is now repository-scoped, rather
than global. This should have little effect on performance but may increase
memory usage.
Handlers
--------
The `handlers` package has been updated to leverage the new API. For the most
part, the changes are superficial or mechanical based on the API changes. This
did expose a bug in the handling of provisional vs canonical digests that was
fixed in the unit tests.
Configuration
-------------
One user-facing change has been made to the configuration and is updated in
the associated documentation. The `layerinfo` cache parameter has been
deprecated by the `blobdescriptor` cache parameter. Both are equivalent and
configuration files should be backward compatible.
Notifications
-------------
Changes the `notification` package are simply to support the interface
changes.
Context
-------
A small change has been made to the tracing log-level. Traces have been moved
from "info" to "debug" level to reduce output when not needed.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-05-12 09:10:29 +02:00
|
|
|
switch err := err.(type) {
|
|
|
|
case distribution.ErrManifestVerification:
|
|
|
|
if len(err) != 2 {
|
|
|
|
t.Fatalf("expected 2 verification errors: %#v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, err := range err {
|
|
|
|
if _, ok := err.(distribution.ErrManifestBlobUnknown); !ok {
|
|
|
|
t.Fatalf("unexpected error type: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
t.Fatalf("unexpected error verifying manifest: %v", err)
|
|
|
|
}
|
2015-02-11 02:41:09 +01:00
|
|
|
|
|
|
|
// Now, upload the layers that were missing!
|
|
|
|
for dgst, rs := range testLayers {
|
Refactor Blob Service API
This PR refactors the blob service API to be oriented around blob descriptors.
Identified by digests, blobs become an abstract entity that can be read and
written using a descriptor as a handle. This allows blobs to take many forms,
such as a ReadSeekCloser or a simple byte buffer, allowing blob oriented
operations to better integrate with blob agnostic APIs (such as the `io`
package). The error definitions are now better organized to reflect conditions
that can only be seen when interacting with the blob API.
The main benefit of this is to separate the much smaller metadata from large
file storage. Many benefits also follow from this. Reading and writing has
been separated into discrete services. Backend implementation is also
simplified, by reducing the amount of metadata that needs to be picked up to
simply serve a read. This also improves cacheability.
"Opening" a blob simply consists of an access check (Stat) and a path
calculation. Caching is greatly simplified and we've made the mapping of
provisional to canonical hashes a first-class concept. BlobDescriptorService
and BlobProvider can be combined in different ways to achieve varying effects.
Recommend Review Approach
-------------------------
This is a very large patch. While apologies are in order, we are getting a
considerable amount of refactoring. Most changes follow from the changes to
the root package (distribution), so start there. From there, the main changes
are in storage. Looking at (*repository).Blobs will help to understand the how
the linkedBlobStore is wired. One can explore the internals within and also
branch out into understanding the changes to the caching layer. Following the
descriptions below will also help to guide you.
To reduce the chances for regressions, it was critical that major changes to
unit tests were avoided. Where possible, they are left untouched and where
not, the spirit is hopefully captured. Pay particular attention to where
behavior may have changed.
Storage
-------
The primary changes to the `storage` package, other than the interface
updates, were to merge the layerstore and blobstore. Blob access is now
layered even further. The first layer, blobStore, exposes a global
`BlobStatter` and `BlobProvider`. Operations here provide a fast path for most
read operations that don't take access control into account. The
`linkedBlobStore` layers on top of the `blobStore`, providing repository-
scoped blob link management in the backend. The `linkedBlobStore` implements
the full `BlobStore` suite, providing access-controlled, repository-local blob
writers. The abstraction between the two is slightly broken in that
`linkedBlobStore` is the only channel under which one can write into the global
blob store. The `linkedBlobStore` also provides flexibility in that it can act
over different link sets depending on configuration. This allows us to use the
same code for signature links, manifest links and blob links. Eventually, we
will fully consolidate this storage.
The improved cache flow comes from the `linkedBlobStatter` component
of `linkedBlobStore`. Using a `cachedBlobStatter`, these combine together to
provide a simple cache hierarchy that should streamline access checks on read
and write operations, or at least provide a single path to optimize. The
metrics have been changed in a slightly incompatible way since the former
operations, Fetch and Exists, are no longer relevant.
The fileWriter and fileReader have been slightly modified to support the rest
of the changes. The most interesting is the removal of the `Stat` call from
`newFileReader`. This was the source of unnecessary round trips that were only
present to look up the size of the resulting reader. Now, one must simply pass
in the size, requiring the caller to decide whether or not the `Stat` call is
appropriate. In several cases, it turned out the caller already had the size
already. The `WriterAt` implementation has been removed from `fileWriter`,
since it is no longer required for `BlobWriter`, reducing the number of paths
which writes may take.
Cache
-----
Unfortunately, the `cache` package required a near full rewrite. It was pretty
mechanical in that the cache is oriented around the `BlobDescriptorService`
slightly modified to include the ability to set the values for individual
digests. While the implementation is oriented towards caching, it can act as a
primary store. Provisions are in place to have repository local metadata, in
addition to global metadata. Fallback is implemented as a part of the storage
package to maintain this flexibility.
One unfortunate side-effect is that caching is now repository-scoped, rather
than global. This should have little effect on performance but may increase
memory usage.
Handlers
--------
The `handlers` package has been updated to leverage the new API. For the most
part, the changes are superficial or mechanical based on the API changes. This
did expose a bug in the handling of provisional vs canonical digests that was
fixed in the unit tests.
Configuration
-------------
One user-facing change has been made to the configuration and is updated in
the associated documentation. The `layerinfo` cache parameter has been
deprecated by the `blobdescriptor` cache parameter. Both are equivalent and
configuration files should be backward compatible.
Notifications
-------------
Changes the `notification` package are simply to support the interface
changes.
Context
-------
A small change has been made to the tracing log-level. Traces have been moved
from "info" to "debug" level to reduce output when not needed.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-05-12 09:10:29 +02:00
|
|
|
wr, err := env.repository.Blobs(env.ctx).Create(env.ctx)
|
2015-02-11 02:41:09 +01:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error creating test upload: %v", err)
|
|
|
|
}
|
|
|
|
|
Refactor Blob Service API
This PR refactors the blob service API to be oriented around blob descriptors.
Identified by digests, blobs become an abstract entity that can be read and
written using a descriptor as a handle. This allows blobs to take many forms,
such as a ReadSeekCloser or a simple byte buffer, allowing blob oriented
operations to better integrate with blob agnostic APIs (such as the `io`
package). The error definitions are now better organized to reflect conditions
that can only be seen when interacting with the blob API.
The main benefit of this is to separate the much smaller metadata from large
file storage. Many benefits also follow from this. Reading and writing has
been separated into discrete services. Backend implementation is also
simplified, by reducing the amount of metadata that needs to be picked up to
simply serve a read. This also improves cacheability.
"Opening" a blob simply consists of an access check (Stat) and a path
calculation. Caching is greatly simplified and we've made the mapping of
provisional to canonical hashes a first-class concept. BlobDescriptorService
and BlobProvider can be combined in different ways to achieve varying effects.
Recommend Review Approach
-------------------------
This is a very large patch. While apologies are in order, we are getting a
considerable amount of refactoring. Most changes follow from the changes to
the root package (distribution), so start there. From there, the main changes
are in storage. Looking at (*repository).Blobs will help to understand the how
the linkedBlobStore is wired. One can explore the internals within and also
branch out into understanding the changes to the caching layer. Following the
descriptions below will also help to guide you.
To reduce the chances for regressions, it was critical that major changes to
unit tests were avoided. Where possible, they are left untouched and where
not, the spirit is hopefully captured. Pay particular attention to where
behavior may have changed.
Storage
-------
The primary changes to the `storage` package, other than the interface
updates, were to merge the layerstore and blobstore. Blob access is now
layered even further. The first layer, blobStore, exposes a global
`BlobStatter` and `BlobProvider`. Operations here provide a fast path for most
read operations that don't take access control into account. The
`linkedBlobStore` layers on top of the `blobStore`, providing repository-
scoped blob link management in the backend. The `linkedBlobStore` implements
the full `BlobStore` suite, providing access-controlled, repository-local blob
writers. The abstraction between the two is slightly broken in that
`linkedBlobStore` is the only channel under which one can write into the global
blob store. The `linkedBlobStore` also provides flexibility in that it can act
over different link sets depending on configuration. This allows us to use the
same code for signature links, manifest links and blob links. Eventually, we
will fully consolidate this storage.
The improved cache flow comes from the `linkedBlobStatter` component
of `linkedBlobStore`. Using a `cachedBlobStatter`, these combine together to
provide a simple cache hierarchy that should streamline access checks on read
and write operations, or at least provide a single path to optimize. The
metrics have been changed in a slightly incompatible way since the former
operations, Fetch and Exists, are no longer relevant.
The fileWriter and fileReader have been slightly modified to support the rest
of the changes. The most interesting is the removal of the `Stat` call from
`newFileReader`. This was the source of unnecessary round trips that were only
present to look up the size of the resulting reader. Now, one must simply pass
in the size, requiring the caller to decide whether or not the `Stat` call is
appropriate. In several cases, it turned out the caller already had the size
already. The `WriterAt` implementation has been removed from `fileWriter`,
since it is no longer required for `BlobWriter`, reducing the number of paths
which writes may take.
Cache
-----
Unfortunately, the `cache` package required a near full rewrite. It was pretty
mechanical in that the cache is oriented around the `BlobDescriptorService`
slightly modified to include the ability to set the values for individual
digests. While the implementation is oriented towards caching, it can act as a
primary store. Provisions are in place to have repository local metadata, in
addition to global metadata. Fallback is implemented as a part of the storage
package to maintain this flexibility.
One unfortunate side-effect is that caching is now repository-scoped, rather
than global. This should have little effect on performance but may increase
memory usage.
Handlers
--------
The `handlers` package has been updated to leverage the new API. For the most
part, the changes are superficial or mechanical based on the API changes. This
did expose a bug in the handling of provisional vs canonical digests that was
fixed in the unit tests.
Configuration
-------------
One user-facing change has been made to the configuration and is updated in
the associated documentation. The `layerinfo` cache parameter has been
deprecated by the `blobdescriptor` cache parameter. Both are equivalent and
configuration files should be backward compatible.
Notifications
-------------
Changes the `notification` package are simply to support the interface
changes.
Context
-------
A small change has been made to the tracing log-level. Traces have been moved
from "info" to "debug" level to reduce output when not needed.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-05-12 09:10:29 +02:00
|
|
|
if _, err := io.Copy(wr, rs); err != nil {
|
2015-02-11 02:41:09 +01:00
|
|
|
t.Fatalf("unexpected error copying to upload: %v", err)
|
|
|
|
}
|
|
|
|
|
Refactor Blob Service API
This PR refactors the blob service API to be oriented around blob descriptors.
Identified by digests, blobs become an abstract entity that can be read and
written using a descriptor as a handle. This allows blobs to take many forms,
such as a ReadSeekCloser or a simple byte buffer, allowing blob oriented
operations to better integrate with blob agnostic APIs (such as the `io`
package). The error definitions are now better organized to reflect conditions
that can only be seen when interacting with the blob API.
The main benefit of this is to separate the much smaller metadata from large
file storage. Many benefits also follow from this. Reading and writing has
been separated into discrete services. Backend implementation is also
simplified, by reducing the amount of metadata that needs to be picked up to
simply serve a read. This also improves cacheability.
"Opening" a blob simply consists of an access check (Stat) and a path
calculation. Caching is greatly simplified and we've made the mapping of
provisional to canonical hashes a first-class concept. BlobDescriptorService
and BlobProvider can be combined in different ways to achieve varying effects.
Recommend Review Approach
-------------------------
This is a very large patch. While apologies are in order, we are getting a
considerable amount of refactoring. Most changes follow from the changes to
the root package (distribution), so start there. From there, the main changes
are in storage. Looking at (*repository).Blobs will help to understand the how
the linkedBlobStore is wired. One can explore the internals within and also
branch out into understanding the changes to the caching layer. Following the
descriptions below will also help to guide you.
To reduce the chances for regressions, it was critical that major changes to
unit tests were avoided. Where possible, they are left untouched and where
not, the spirit is hopefully captured. Pay particular attention to where
behavior may have changed.
Storage
-------
The primary changes to the `storage` package, other than the interface
updates, were to merge the layerstore and blobstore. Blob access is now
layered even further. The first layer, blobStore, exposes a global
`BlobStatter` and `BlobProvider`. Operations here provide a fast path for most
read operations that don't take access control into account. The
`linkedBlobStore` layers on top of the `blobStore`, providing repository-
scoped blob link management in the backend. The `linkedBlobStore` implements
the full `BlobStore` suite, providing access-controlled, repository-local blob
writers. The abstraction between the two is slightly broken in that
`linkedBlobStore` is the only channel under which one can write into the global
blob store. The `linkedBlobStore` also provides flexibility in that it can act
over different link sets depending on configuration. This allows us to use the
same code for signature links, manifest links and blob links. Eventually, we
will fully consolidate this storage.
The improved cache flow comes from the `linkedBlobStatter` component
of `linkedBlobStore`. Using a `cachedBlobStatter`, these combine together to
provide a simple cache hierarchy that should streamline access checks on read
and write operations, or at least provide a single path to optimize. The
metrics have been changed in a slightly incompatible way since the former
operations, Fetch and Exists, are no longer relevant.
The fileWriter and fileReader have been slightly modified to support the rest
of the changes. The most interesting is the removal of the `Stat` call from
`newFileReader`. This was the source of unnecessary round trips that were only
present to look up the size of the resulting reader. Now, one must simply pass
in the size, requiring the caller to decide whether or not the `Stat` call is
appropriate. In several cases, it turned out the caller already had the size
already. The `WriterAt` implementation has been removed from `fileWriter`,
since it is no longer required for `BlobWriter`, reducing the number of paths
which writes may take.
Cache
-----
Unfortunately, the `cache` package required a near full rewrite. It was pretty
mechanical in that the cache is oriented around the `BlobDescriptorService`
slightly modified to include the ability to set the values for individual
digests. While the implementation is oriented towards caching, it can act as a
primary store. Provisions are in place to have repository local metadata, in
addition to global metadata. Fallback is implemented as a part of the storage
package to maintain this flexibility.
One unfortunate side-effect is that caching is now repository-scoped, rather
than global. This should have little effect on performance but may increase
memory usage.
Handlers
--------
The `handlers` package has been updated to leverage the new API. For the most
part, the changes are superficial or mechanical based on the API changes. This
did expose a bug in the handling of provisional vs canonical digests that was
fixed in the unit tests.
Configuration
-------------
One user-facing change has been made to the configuration and is updated in
the associated documentation. The `layerinfo` cache parameter has been
deprecated by the `blobdescriptor` cache parameter. Both are equivalent and
configuration files should be backward compatible.
Notifications
-------------
Changes the `notification` package are simply to support the interface
changes.
Context
-------
A small change has been made to the tracing log-level. Traces have been moved
from "info" to "debug" level to reduce output when not needed.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-05-12 09:10:29 +02:00
|
|
|
if _, err := wr.Commit(env.ctx, distribution.Descriptor{Digest: dgst}); err != nil {
|
2015-02-11 02:41:09 +01:00
|
|
|
t.Fatalf("unexpected error finishing upload: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
if err = ms.Put(sm); err != nil {
|
2015-02-11 02:41:09 +01:00
|
|
|
t.Fatalf("unexpected error putting manifest: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
exists, err = ms.ExistsByTag(env.tag)
|
2015-02-11 02:41:09 +01:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error checking manifest existence: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !exists {
|
|
|
|
t.Fatalf("manifest should exist")
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
fetchedManifest, err := ms.GetByTag(env.tag)
|
2015-05-27 19:52:22 +02:00
|
|
|
|
2015-02-11 02:41:09 +01:00
|
|
|
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)
|
|
|
|
}
|
|
|
|
|
|
|
|
fetchedJWS, err := libtrust.ParsePrettySignature(fetchedManifest.Raw, "signatures")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error parsing jws: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
payload, err := fetchedJWS.Payload()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error extracting payload: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
// Now that we have a payload, take a moment to check that the manifest is
|
|
|
|
// return by the payload digest.
|
|
|
|
dgst, err := digest.FromBytes(payload)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error getting manifest digest: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
exists, err = ms.Exists(dgst)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error checking manifest existence by digest: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !exists {
|
|
|
|
t.Fatalf("manifest %s should exist", dgst)
|
|
|
|
}
|
|
|
|
|
|
|
|
fetchedByDigest, err := ms.Get(dgst)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error fetching manifest by digest: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !reflect.DeepEqual(fetchedByDigest, fetchedManifest) {
|
|
|
|
t.Fatalf("fetched manifest not equal: %#v != %#v", fetchedByDigest, fetchedManifest)
|
|
|
|
}
|
|
|
|
|
2015-02-11 02:41:09 +01:00
|
|
|
sigs, err := fetchedJWS.Signatures()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unable to extract signatures: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(sigs) != 1 {
|
|
|
|
t.Fatalf("unexpected number of signatures: %d != %d", len(sigs), 1)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Grabs the tags and check that this tagged manifest is present
|
|
|
|
tags, err := ms.Tags()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error fetching tags: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(tags) != 1 {
|
|
|
|
t.Fatalf("unexpected tags returned: %v", tags)
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
if tags[0] != env.tag {
|
|
|
|
t.Fatalf("unexpected tag found in tags: %v != %v", tags, []string{env.tag})
|
2015-02-11 02:41:09 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Now, push the same manifest with a different key
|
|
|
|
pk2, err := libtrust.GenerateECP256PrivateKey()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error generating private key: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-08-21 06:24:30 +02:00
|
|
|
sm2, err := schema1.Sign(&m, pk2)
|
2015-02-11 02:41:09 +01:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error signing manifest: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
jws2, err := libtrust.ParsePrettySignature(sm2.Raw, "signatures")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error parsing signature: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
sigs2, err := jws2.Signatures()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unable to extract signatures: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(sigs2) != 1 {
|
|
|
|
t.Fatalf("unexpected number of signatures: %d != %d", len(sigs2), 1)
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
if err = ms.Put(sm2); err != nil {
|
2015-02-11 02:41:09 +01:00
|
|
|
t.Fatalf("unexpected error putting manifest: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:47:04 +01:00
|
|
|
fetched, err := ms.GetByTag(env.tag)
|
2015-02-11 02:41:09 +01:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error fetching manifest: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-08-21 06:24:30 +02:00
|
|
|
if _, err := schema1.Verify(fetched); err != nil {
|
2015-02-11 02:41:09 +01:00
|
|
|
t.Fatalf("unexpected error verifying manifest: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Assemble our payload and two signatures to get what we expect!
|
|
|
|
expectedJWS, err := libtrust.NewJSONSignature(payload, sigs[0], sigs2[0])
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error merging jws: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
expectedSigs, err := expectedJWS.Signatures()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error getting expected signatures: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
receivedJWS, err := libtrust.ParsePrettySignature(fetched.Raw, "signatures")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error parsing jws: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
receivedPayload, err := receivedJWS.Payload()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error extracting received payload: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !bytes.Equal(receivedPayload, payload) {
|
|
|
|
t.Fatalf("payloads are not equal")
|
|
|
|
}
|
|
|
|
|
|
|
|
receivedSigs, err := receivedJWS.Signatures()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error getting signatures: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, sig := range receivedSigs {
|
|
|
|
if !bytes.Equal(sig, expectedSigs[i]) {
|
|
|
|
t.Fatalf("mismatched signatures from remote: %v != %v", string(sig), string(expectedSigs[i]))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-27 19:52:22 +02:00
|
|
|
// Test deleting manifests
|
|
|
|
err = ms.Delete(dgst)
|
|
|
|
if err != nil {
|
2015-02-27 00:47:04 +01:00
|
|
|
t.Fatalf("unexpected an error deleting manifest by digest: %v", err)
|
2015-02-11 02:41:09 +01:00
|
|
|
}
|
2015-05-27 19:52:22 +02:00
|
|
|
|
|
|
|
exists, err = ms.Exists(dgst)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Error querying manifest existence")
|
|
|
|
}
|
|
|
|
if exists {
|
|
|
|
t.Errorf("Deleted manifest should not exist")
|
|
|
|
}
|
|
|
|
|
|
|
|
deletedManifest, err := ms.Get(dgst)
|
|
|
|
if err == nil {
|
|
|
|
t.Errorf("Unexpected success getting deleted manifest")
|
|
|
|
}
|
|
|
|
switch err.(type) {
|
|
|
|
case distribution.ErrManifestUnknownRevision:
|
|
|
|
break
|
|
|
|
default:
|
|
|
|
t.Errorf("Unexpected error getting deleted manifest: %s", reflect.ValueOf(err).Type())
|
|
|
|
}
|
|
|
|
|
|
|
|
if deletedManifest != nil {
|
|
|
|
t.Errorf("Deleted manifest get returned non-nil")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Re-upload should restore manifest to a good state
|
|
|
|
err = ms.Put(sm)
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error re-uploading deleted manifest")
|
|
|
|
}
|
|
|
|
|
|
|
|
exists, err = ms.Exists(dgst)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Error querying manifest existence")
|
|
|
|
}
|
|
|
|
if !exists {
|
|
|
|
t.Errorf("Restored manifest should exist")
|
|
|
|
}
|
|
|
|
|
|
|
|
deletedManifest, err = ms.Get(dgst)
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Unexpected error getting manifest")
|
|
|
|
}
|
|
|
|
if deletedManifest == nil {
|
|
|
|
t.Errorf("Deleted manifest get returned non-nil")
|
|
|
|
}
|
|
|
|
|
2015-08-18 19:56:27 +02:00
|
|
|
r, err := NewRegistry(ctx, env.driver, BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), EnableRedirect)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error creating registry: %v", err)
|
|
|
|
}
|
2015-05-27 19:52:22 +02:00
|
|
|
repo, err := r.Repository(ctx, env.name)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error getting repo: %v", err)
|
|
|
|
}
|
|
|
|
ms, err = repo.Manifests(ctx)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
err = ms.Delete(dgst)
|
|
|
|
if err == nil {
|
|
|
|
t.Errorf("Unexpected success deleting while disabled")
|
|
|
|
}
|
2015-02-11 02:41:09 +01:00
|
|
|
}
|
2015-08-12 22:07:57 +02:00
|
|
|
|
|
|
|
// TestLinkPathFuncs ensures that the link path functions behavior are locked
|
|
|
|
// down and implemented as expected.
|
|
|
|
func TestLinkPathFuncs(t *testing.T) {
|
|
|
|
for _, testcase := range []struct {
|
|
|
|
repo string
|
|
|
|
digest digest.Digest
|
|
|
|
linkPathFn linkPathFunc
|
|
|
|
expected string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
repo: "foo/bar",
|
|
|
|
digest: "sha256:deadbeaf",
|
|
|
|
linkPathFn: blobLinkPath,
|
|
|
|
expected: "/docker/registry/v2/repositories/foo/bar/_layers/sha256/deadbeaf/link",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
repo: "foo/bar",
|
|
|
|
digest: "sha256:deadbeaf",
|
|
|
|
linkPathFn: manifestRevisionLinkPath,
|
|
|
|
expected: "/docker/registry/v2/repositories/foo/bar/_manifests/revisions/sha256/deadbeaf/link",
|
|
|
|
},
|
|
|
|
} {
|
2015-08-18 03:51:05 +02:00
|
|
|
p, err := testcase.linkPathFn(testcase.repo, testcase.digest)
|
2015-08-12 22:07:57 +02:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("unexpected error calling linkPathFn(pm, %q, %q): %v", testcase.repo, testcase.digest, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if p != testcase.expected {
|
|
|
|
t.Fatalf("incorrect path returned: %q != %q", p, testcase.expected)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|