containerd
diff --git a/‎api/events/snapshot.pb.go
Copy file name to clipboard
+48-17Lines changed: 48 additions & 17 deletions b/‎api/events/snapshot.pb.go
Copy file name to clipboard
+48-17Lines changed: 48 additions & 17 deletions
diff --git a/‎api/events/snapshot.proto
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎api/events/snapshot.proto
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎api/events/snapshot_fieldpath.pb.go
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎api/events/snapshot_fieldpath.pb.go
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎api/next.pb.txt
Copy file name to clipboard
+21Lines changed: 21 additions & 0 deletions b/‎api/next.pb.txt
Copy file name to clipboard
+21Lines changed: 21 additions & 0 deletions
diff --git a/‎services/snapshots/snapshotters.go
Copy file name to clipboard
+12-7Lines changed: 12 additions & 7 deletions b/‎services/snapshots/snapshotters.go
Copy file name to clipboard
+12-7Lines changed: 12 additions & 7 deletions
@@ -26,13 +26,16 @@ option (containerd.plugin.fieldpath_all) = true;
 message SnapshotPrepare {
 	string key = 1;
 	string parent = 2;
+	string snapshotter = 5;
 }
 
 message SnapshotCommit {
 	string key = 1;
 	string name = 2;
+	string snapshotter = 5;
 }
 
 message SnapshotRemove {
 	string key = 1;
+	string snapshotter = 5;
 }
@@ -400,6 +400,13 @@ file {
       type: TYPE_STRING
       json_name: "parent"
     }
+    field {
+      name: "snapshotter"
+      number: 5
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "snapshotter"
+    }
   }
   message_type {
     name: "SnapshotCommit"
@@ -417,6 +424,13 @@ file {
       type: TYPE_STRING
       json_name: "name"
     }
+    field {
+      name: "snapshotter"
+      number: 5
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "snapshotter"
+    }
   }
   message_type {
     name: "SnapshotRemove"
@@ -427,6 +441,13 @@ file {
       type: TYPE_STRING
       json_name: "key"
     }
+    field {
+      name: "snapshotter"
+      number: 5
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "snapshotter"
+    }
   }
   options {
     go_package: "github.com/containerd/containerd/api/events;events"
 
@@ -31,6 +31,7 @@ import (
 // snapshotter wraps snapshots.Snapshotter with proper events published.
 type snapshotter struct {
 	snapshots.Snapshotter
+	name      string
 	publisher events.Publisher
 }
 
@@ -55,16 +56,17 @@ func init() {
 			db := m.(*metadata.DB)
 			ss := make(map[string]snapshots.Snapshotter)
 			for n, sn := range db.Snapshotters() {
-				ss[n] = newSnapshotter(sn, ep.(events.Publisher))
+				ss[n] = newSnapshotter(sn, n, ep.(events.Publisher))
 			}
 			return ss, nil
 		},
 	})
 }
 
-func newSnapshotter(sn snapshots.Snapshotter, publisher events.Publisher) snapshots.Snapshotter {
+func newSnapshotter(sn snapshots.Snapshotter, name string, publisher events.Publisher) snapshots.Snapshotter {
 	return &snapshotter{
 		Snapshotter: sn,
+		name:        name,
 		publisher:   publisher,
 	}
 }
@@ -75,8 +77,9 @@ func (s *snapshotter) Prepare(ctx context.Context, key, parent string, opts ...s
 		return nil, err
 	}
 	if err := s.publisher.Publish(ctx, "/snapshot/prepare", &eventstypes.SnapshotPrepare{
-		Key:    key,
-		Parent: parent,
+		Key:         key,
+		Parent:      parent,
+		Snapshotter: s.name,
 	}); err != nil {
 		return nil, err
 	}
@@ -88,8 +91,9 @@ func (s *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
 		return err
 	}
 	return s.publisher.Publish(ctx, "/snapshot/commit", &eventstypes.SnapshotCommit{
-		Key:  key,
-		Name: name,
+		Key:         key,
+		Name:        name,
+		Snapshotter: s.name,
 	})
 }
 
@@ -98,6 +102,7 @@ func (s *snapshotter) Remove(ctx context.Context, key string) error {
 		return err
 	}
 	return s.publisher.Publish(ctx, "/snapshot/remove", &eventstypes.SnapshotRemove{
-		Key: key,
+		Key:         key,
+		Snapshotter: s.name,
 	})
 }
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,16 @@ option (containerd.plugin.fieldpath_all) = true;`
`26`	`26`	`message SnapshotPrepare {`
`27`	`27`	`string key = 1;`
`28`	`28`	`string parent = 2;`
	`29`	`+ string snapshotter = 5;`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`message SnapshotCommit {`
`32`	`33`	`string key = 1;`
`33`	`34`	`string name = 2;`
	`35`	`+ string snapshotter = 5;`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`message SnapshotRemove {`
`37`	`39`	`string key = 1;`
	`40`	`+ string snapshotter = 5;`
`38`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ import (`
`31`	`31`	`// snapshotter wraps snapshots.Snapshotter with proper events published.`
`32`	`32`	`type snapshotter struct {`
`33`	`33`	`snapshots.Snapshotter`
	`34`	`+ name string`
`34`	`35`	`publisher events.Publisher`
`35`	`36`	`}`
`36`	`37`
`@@ -55,16 +56,17 @@ func init() {`
`55`	`56`	`db := m.(*metadata.DB)`
`56`	`57`	`ss := make(map[string]snapshots.Snapshotter)`
`57`	`58`	`for n, sn := range db.Snapshotters() {`
`58`		`- ss[n] = newSnapshotter(sn, ep.(events.Publisher))`
	`59`	`+ ss[n] = newSnapshotter(sn, n, ep.(events.Publisher))`
`59`	`60`	`}`
`60`	`61`	`return ss, nil`
`61`	`62`	`},`
`62`	`63`	`})`
`63`	`64`	`}`
`64`	`65`
`65`		`-func newSnapshotter(sn snapshots.Snapshotter, publisher events.Publisher) snapshots.Snapshotter {`
	`66`	`+func newSnapshotter(sn snapshots.Snapshotter, name string, publisher events.Publisher) snapshots.Snapshotter {`
`66`	`67`	`return &snapshotter{`
`67`	`68`	`Snapshotter: sn,`
	`69`	`+ name: name,`
`68`	`70`	`publisher: publisher,`
`69`	`71`	`}`
`70`	`72`	`}`
`@@ -75,8 +77,9 @@ func (s *snapshotter) Prepare(ctx context.Context, key, parent string, opts ...s`
`75`	`77`	`return nil, err`
`76`	`78`	`}`
`77`	`79`	`if err := s.publisher.Publish(ctx, "/snapshot/prepare", &eventstypes.SnapshotPrepare{`
`78`		`- Key: key,`
`79`		`- Parent: parent,`
	`80`	`+ Key: key,`
	`81`	`+ Parent: parent,`
	`82`	`+ Snapshotter: s.name,`
`80`	`83`	`}); err != nil {`
`81`	`84`	`return nil, err`
`82`	`85`	`}`
`@@ -88,8 +91,9 @@ func (s *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap`
`88`	`91`	`return err`
`89`	`92`	`}`
`90`	`93`	`return s.publisher.Publish(ctx, "/snapshot/commit", &eventstypes.SnapshotCommit{`
`91`		`- Key: key,`
`92`		`- Name: name,`
	`94`	`+ Key: key,`
	`95`	`+ Name: name,`
	`96`	`+ Snapshotter: s.name,`
`93`	`97`	`})`
`94`	`98`	`}`
`95`	`99`
`@@ -98,6 +102,7 @@ func (s *snapshotter) Remove(ctx context.Context, key string) error {`
`98`	`102`	`return err`
`99`	`103`	`}`
`100`	`104`	`return s.publisher.Publish(ctx, "/snapshot/remove", &eventstypes.SnapshotRemove{`
`101`		`- Key: key,`
	`105`	`+ Key: key,`
	`106`	`+ Snapshotter: s.name,`
`102`	`107`	`})`
`103`	`108`	`}`