github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add context to content commit

Browse Source 
Content commit is updated to take in a context, allowing
content to be committed within the same context the writer
was in. This is useful when commit may be able to use more
context to complete the action rather than creating its own.
An example of this being useful is for the metadata implementation
of content, having a context allows tests to fully create
content in one database transaction by making use of the context.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan
2017-09-06 10:19:12 -07:00
parent e4a77fcc0a
commit 9613acb2ed
16 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/content.go
View File

@@ -90,7 +90,7 @@ type Writer interface {
// Commit commits the blob (but no roll-back is guaranteed on an error).
// size and expected can be zero-value when unknown.
Commit(size int64, expected digest.Digest, opts ...Opt) error
Commit(ctx context.Context, size int64, expected digest.Digest, opts ...Opt) error
// Status returns the current state of write
Status() (Status, error)

6
content/helpers.go
View File

@@ -58,7 +58,7 @@ func WriteBlob(ctx context.Context, cs Ingester, ref string, r io.Reader, size i
}
defer cw.Close()
return Copy(cw, r, size, expected)
return Copy(ctx, cw, r, size, expected)
}
// Copy copies data with the expected digest from the reader into the
@@ -68,7 +68,7 @@ func WriteBlob(ctx context.Context, cs Ingester, ref string, r io.Reader, size i
// the size or digest is unknown, these values may be empty.
//
// Copy is buffered, so no need to wrap reader in buffered io.
func Copy(cw Writer, r io.Reader, size int64, expected digest.Digest) error {
func Copy(ctx context.Context, cw Writer, r io.Reader, size int64, expected digest.Digest) error {
ws, err := cw.Status()
if err != nil {
return err
@@ -95,7 +95,7 @@ func Copy(cw Writer, r io.Reader, size int64, expected digest.Digest) error {
return err
}
if err := cw.Commit(size, expected); err != nil {
if err := cw.Commit(ctx, size, expected); err != nil {
if !errdefs.IsAlreadyExists(err) {
return errors.Wrapf(err, "failed commit on ref %q", ws.Ref)
}

4
content/local/store_test.go
View File

@@ -94,7 +94,7 @@ func TestContentWriter(t *testing.T) {
checkCopy(t, int64(len(p)), cw, bufio.NewReader(ioutil.NopCloser(bytes.NewReader(p))))
if err := cw.Commit(int64(len(p)), expected); err != nil {
if err := cw.Commit(ctx, int64(len(p)), expected); err != nil {
t.Fatal(err)
}
@@ -109,7 +109,7 @@ func TestContentWriter(t *testing.T) {
// now, attempt to write the same data again
checkCopy(t, int64(len(p)), cw, bufio.NewReader(ioutil.NopCloser(bytes.NewReader(p))))
if err := cw.Commit(int64(len(p)), expected); err != nil {
if err := cw.Commit(ctx, int64(len(p)), expected); err != nil {
t.Fatal(err)
}

3
content/local/writer.go
View File

@@ -1,6 +1,7 @@
package local
import (
"context"
"os"
"path/filepath"
"runtime"
@@ -54,7 +55,7 @@ func (w *writer) Write(p []byte) (n int, err error) {
return n, err
}
func (w *writer) Commit(size int64, expected digest.Digest, opts ...content.Opt) error {
func (w *writer) Commit(ctx context.Context, size int64, expected digest.Digest, opts ...content.Opt) error {
if w.fp == nil {
return errors.Wrap(errdefs.ErrFailedPrecondition, "cannot commit on closed writer")
}

6
content/testsuite/testsuite.go
View File

@@ -121,7 +121,7 @@ func checkContentStoreWriter(ctx context.Context, t *testing.T, cs content.Store
}
preCommit := time.Now()
if err := s.writer.Commit(0, ""); err != nil {
if err := s.writer.Commit(ctx, 0, ""); err != nil {
t.Fatal(err)
}
postCommit := time.Now()
@@ -201,7 +201,7 @@ func checkUploadStatus(ctx context.Context, t *testing.T, cs content.Store) {
}
preCommit := time.Now()
if err := w1.Commit(0, ""); err != nil {
if err := w1.Commit(ctx, 0, ""); err != nil {
t.Fatalf("Commit failed: %+v", err)
}
postCommit := time.Now()
@@ -235,7 +235,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {
}
preCommit := time.Now()
if err := w1.Commit(0, "", content.WithLabels(labels)); err != nil {
if err := w1.Commit(ctx, 0, "", content.WithLabels(labels)); err != nil {
t.Fatalf("Commit failed: %+v", err)
}
postCommit := time.Now()