containerd
diff --git a/‎api/events/content.pb.go
Copy file name to clipboard
+85-13Lines changed: 85 additions & 13 deletions b/‎api/events/content.pb.go
Copy file name to clipboard
+85-13Lines changed: 85 additions & 13 deletions
diff --git a/‎api/events/content.proto
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎api/events/content.proto
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎api/events/content_fieldpath.pb.go
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions b/‎api/events/content_fieldpath.pb.go
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
diff --git a/‎api/next.pb.txt
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions b/‎api/next.pb.txt
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎core/metadata/content.go
Copy file name to clipboard
+33-17Lines changed: 33 additions & 17 deletions b/‎core/metadata/content.go
Copy file name to clipboard
+33-17Lines changed: 33 additions & 17 deletions
diff --git a/‎go.mod
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎go.mod
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎go.sum
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions b/‎go.sum
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions
@@ -23,6 +23,11 @@ import "github.com/containerd/containerd/api/types/fieldpath.proto";
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
+message ContentCreate {
+	string digest = 1;
+	int64 size = 2;
+}
+
 message ContentDelete {
 	string digest = 1;
 }
@@ -175,6 +175,23 @@ file {
   name: "github.com/containerd/containerd/api/events/content.proto"
   package: "containerd.events"
   dependency: "github.com/containerd/containerd/api/types/fieldpath.proto"
+  message_type {
+    name: "ContentCreate"
+    field {
+      name: "digest"
+      number: 1
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "digest"
+    }
+    field {
+      name: "size"
+      number: 2
+      label: LABEL_OPTIONAL
+      type: TYPE_INT64
+      json_name: "size"
+    }
+  }
   message_type {
     name: "ContentDelete"
     field {
 
@@ -501,7 +501,7 @@ type namespacedWriter struct {
 	ctx       context.Context
 	ref       string
 	namespace string
-	db        Transactor
+	db        *DB
 	provider  interface {
 		content.Provider
 		content.Ingester
@@ -587,6 +587,8 @@ func (nw *namespacedWriter) Commit(ctx context.Context, size int64, expected dig
 	defer nw.l.RUnlock()
 
 	var innerErr error
+	var actualDgst digest.Digest
+	var actualSize int64
 
 	// We pre-sync the in-flight writes to the disk. This avoids the
 	// subsequent fp.Sync() call[1]	from taking too long (10s+) while
@@ -601,13 +603,15 @@ func (nw *namespacedWriter) Commit(ctx context.Context, size int64, expected dig
 	}
 
 	if err := update(ctx, nw.db, func(tx *bolt.Tx) error {
-		dgst, err := nw.commit(ctx, tx, size, expected, opts...)
+		dgst, size, err := nw.commit(ctx, tx, size, expected, opts...)
 		if err != nil {
 			if !errdefs.IsAlreadyExists(err) {
 				return err
 			}
 			innerErr = err
 		}
+		actualDgst = dgst
+		actualSize = size
 		bkt := getIngestsBucket(tx, nw.namespace)
 		if bkt != nil {
 			if err := bkt.DeleteBucket([]byte(nw.ref)); err != nil && err != errbolt.ErrBucketNotFound {
@@ -621,8 +625,20 @@ func (nw *namespacedWriter) Commit(ctx context.Context, size int64, expected dig
 	}); err != nil {
 		return err
 	}
+	if innerErr != nil {
+		return innerErr
+	}
 
-	return innerErr
+	if publisher := nw.db.Publisher(ctx); publisher != nil {
+		if err := publisher.Publish(ctx, "/content/create", &eventstypes.ContentCreate{
+			Digest: actualDgst.String(),
+			Size:   actualSize,
+		}); err != nil {
+			return err
+		}
+	}
+
+	return nil
 }
 
 func (nw *namespacedWriter) Sync() error {
@@ -632,73 +648,73 @@ func (nw *namespacedWriter) Sync() error {
 	return nil
 }
 
-func (nw *namespacedWriter) commit(ctx context.Context, tx *bolt.Tx, size int64, expected digest.Digest, opts ...content.Opt) (digest.Digest, error) {
+func (nw *namespacedWriter) commit(ctx context.Context, tx *bolt.Tx, size int64, expected digest.Digest, opts ...content.Opt) (digest.Digest, int64, error) {
 	var base content.Info
 	for _, opt := range opts {
 		if err := opt(&base); err != nil {
 			if nw.w != nil {
 				nw.w.Close()
 			}
-			return "", err
+			return "", 0, err
 		}
 	}
 	if err := validateInfo(&base); err != nil {
 		if nw.w != nil {
 			nw.w.Close()
 		}
-		return "", err
+		return "", 0, err
 	}
 
 	var actual digest.Digest
 	if nw.w == nil {
 		if size != 0 && size != nw.desc.Size {
-			return "", fmt.Errorf("%q failed size validation: %v != %v: %w", nw.ref, nw.desc.Size, size, errdefs.ErrFailedPrecondition)
+			return "", 0, fmt.Errorf("%q failed size validation: %v != %v: %w", nw.ref, nw.desc.Size, size, errdefs.ErrFailedPrecondition)
 		}
 		if expected != "" && expected != nw.desc.Digest {
-			return "", fmt.Errorf("%q unexpected digest: %w", nw.ref, errdefs.ErrFailedPrecondition)
+			return "", 0, fmt.Errorf("%q unexpected digest: %w", nw.ref, errdefs.ErrFailedPrecondition)
 		}
 		size = nw.desc.Size
 		actual = nw.desc.Digest
 	} else {
 		status, err := nw.w.Status()
 		if err != nil {
 			nw.w.Close()
-			return "", err
+			return "", 0, err
 		}
 		if size != 0 && size != status.Offset {
 			nw.w.Close()
-			return "", fmt.Errorf("%q failed size validation: %v != %v: %w", nw.ref, status.Offset, size, errdefs.ErrFailedPrecondition)
+			return "", 0, fmt.Errorf("%q failed size validation: %v != %v: %w", nw.ref, status.Offset, size, errdefs.ErrFailedPrecondition)
 		}
 		size = status.Offset
 
 		if err := nw.w.Commit(ctx, size, expected); err != nil && !errdefs.IsAlreadyExists(err) {
-			return "", err
+			return "", 0, err
 		}
 		actual = nw.w.Digest()
 	}
 
 	bkt, err := createBlobBucket(tx, nw.namespace, actual)
 	if err != nil {
 		if err == errbolt.ErrBucketExists {
-			return actual, fmt.Errorf("content %v: %w", actual, errdefs.ErrAlreadyExists)
+			return actual, 0, fmt.Errorf("content %v: %w", actual, errdefs.ErrAlreadyExists)
 		}
-		return "", err
+		return "", 0, err
 	}
 
 	commitTime := time.Now().UTC()
 
 	sizeEncoded, err := encodeInt(size)
 	if err != nil {
-		return "", err
+		return "", 0, err
 	}
 
 	if err := boltutil.WriteTimestamps(bkt, commitTime, commitTime); err != nil {
-		return "", err
+		return "", 0, err
 	}
 	if err := boltutil.WriteLabels(bkt, base.Labels); err != nil {
-		return "", err
+		return "", 0, err
 	}
-	return actual, bkt.Put(bucketKeySize, sizeEncoded)
+	return actual, size, bkt.Put(bucketKeySize, sizeEncoded)
 }
 
 func (nw *namespacedWriter) Status() (st content.Status, err error) {
 
@@ -167,3 +167,5 @@ exclude (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
 )
+
+replace github.com/containerd/containerd/api => ./api
@@ -37,8 +37,6 @@ github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJ
 github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
 github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
 github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
-github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
-github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
 github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
 github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
 github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
Original file line number	Diff line number	Diff line change
`@@ -167,3 +167,5 @@ exclude (`
`167`	`167`	`github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc`
`168`	`168`	`github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2`
`169`	`169`	`)`
	`170`	`+`
	`171`	`+replace github.com/containerd/containerd/api => ./api`