Merge pull request #5276 from aaronlehmann/tracker-false-positives

fuweid · web-flow · commit 85041ffe5875 · 2021-04-07T11:22:43.000+08:00
remotes/docker: Only return "already exists" on push when the upload was sucessful
diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go
@@ -52,7 +52,7 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten
 	ref := remotes.MakeRefKey(ctx, desc)
 	status, err := p.tracker.GetStatus(ref)
 	if err == nil {
-		if status.Offset == status.Total {
+		if status.Committed && status.Offset == status.Total {
 			return nil, errors.Wrapf(errdefs.ErrAlreadyExists, "ref %v", ref)
 		}
 		// TODO: Handle incomplete status
@@ -341,8 +341,6 @@ func (pw *pushWriter) Commit(ctx context.Context, size int64, expected digest.Di
 	if err := pw.pipe.Close(); err != nil {
 		return err
 	}
-	// TODO: Update status to determine committing
-
 	// TODO: timeout waiting for response
 	resp := <-pw.responseC
 	if resp.err != nil {
@@ -379,6 +377,10 @@ func (pw *pushWriter) Commit(ctx context.Context, size int64, expected digest.Di
 		return errors.Errorf("got digest %s, expected %s", actual, expected)
 	}
 
+	status.Committed = true
+	status.UpdatedAt = time.Now()
+	pw.tracker.SetStatus(pw.ref, status)
+
 	return nil
 }
 
diff --git a/remotes/docker/status.go b/remotes/docker/status.go
@@ -28,6 +28,8 @@ import (
 type Status struct {
 	content.Status
 
+	Committed bool
+
 	// UploadUUID is used by the Docker registry to reference blob uploads
 	UploadUUID string
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ import (`
`28`	`28`	`type Status struct {`
`29`	`29`	`content.Status`
`30`	`30`
	`31`	`+ Committed bool`
	`32`	`+`
`31`	`33`	`// UploadUUID is used by the Docker registry to reference blob uploads`
`32`	`34`	`UploadUUID string`
`33`	`35`	`}`