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

api, metadata: use map type for Container.Extensions

Browse Source 
To allow for updating extensions without collisions, we have moved to
using a map type that can be explicitly selected via the field path for
updates. This ensures that multiple parties can operate on their
extensions without stepping on each other's toes or incurring an
inordinate number of round trips.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2017-09-08 14:51:30 -07:00
parent 3552ce5688
commit f7d31e2be4
9 changed files with 349 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
metadata/containers.go
View File

@@ -181,6 +181,15 @@ func (s *containerStore) Update(ctx context.Context, container containers.Contai
continue
}
if strings.HasPrefix(path, "extensions.") {
if updated.Extensions == nil {
updated.Extensions = map[string]types.Any{}
}
key := strings.TrimPrefix(path, "extensions.")
updated.Extensions[key] = container.Extensions[key]
continue
}
switch path {
case "labels":
updated.Labels = container.Labels
@@ -228,6 +237,12 @@ func validateContainer(container *containers.Container) error {
return errors.Wrapf(err, "container.ID validation error")
}
for k := range container.Extensions {
if k == "" {
return errors.Wrapf(errdefs.ErrInvalidArgument, "container.Extension keys must not be zero-length")
}
}
// labels and image have no validation
if container.Runtime.Name == "" {
return errors.Wrapf(errdefs.ErrInvalidArgument, "container.Runtime.Name must be set")
@@ -291,19 +306,25 @@ func readContainer(container *containers.Container, bkt *bolt.Bucket) error {
case string(bucketKeySnapshotter):
container.Snapshotter = string(v)
case string(bucketKeyExtensions):
buf := proto.NewBuffer(v)
n, err := buf.DecodeVarint()
if err != nil {
return errors.Wrap(err, "error reading number of container extensions")
ebkt := bkt.Bucket(bucketKeyExtensions)
if ebkt == nil {
return nil
}
extensions := make([]types.Any, 0, n)
for i := 0; i < int(n); i++ {
var any types.Any
if err := buf.DecodeMessage(&any); err != nil {
return errors.Wrap(err, "error decoding container extension")
extensions := make(map[string]types.Any)
if err := ebkt.ForEach(func(k, v []byte) error {
var a types.Any
if err := proto.Unmarshal(v, &a); err != nil {
return err
}
extensions = append(extensions, any)
extensions[string(k)] = a
return nil
}); err != nil {
return err
}
container.Extensions = extensions
}
@@ -352,18 +373,21 @@ func writeContainer(bkt *bolt.Bucket, container *containers.Container) error {
return err
}
if container.Extensions != nil {
buf := proto.NewBuffer(nil)
if err := buf.EncodeVarint(uint64(len(container.Extensions))); err != nil {
if len(container.Extensions) > 0 {
ebkt, err := bkt.CreateBucketIfNotExists(bucketKeyExtensions)
if err != nil {
return err
}
for _, ext := range container.Extensions {
if err := buf.EncodeMessage(&ext); err != nil {
for name, ext := range container.Extensions {
p, err := proto.Marshal(&ext)
if err != nil {
return err
}
if err := ebkt.Put([]byte(name), p); err != nil {
return err
}
}
if err := bkt.Put(bucketKeyExtensions, buf.Bytes()); err != nil {
return err
}
}