From e30e0c8b75663ace10348d48e99b048fa877c44a Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Mon, 4 Sep 2017 07:02:43 +0000 Subject: [PATCH] api: RootFS -> SnapshotKey Signed-off-by: Akihiro Suda Signed-off-by: Stephen J Day --- api/next.pb.txt | 14 +-- api/services/containers/v1/containers.pb.go | 115 ++++++++++---------- api/services/containers/v1/containers.proto | 6 +- api/services/events/v1/container.pb.go | 82 +++++++------- api/services/events/v1/container.proto | 2 +- container.go | 4 +- container_opts.go | 14 +-- container_opts_unix.go | 8 +- containers/containers.go | 4 +- containerstore.go | 4 +- metadata/buckets.go | 2 +- metadata/containers.go | 14 +-- metadata/containers_test.go | 40 +++---- services/containers/helpers.go | 4 +- services/containers/service.go | 8 +- spec_opts_unix.go | 16 +-- task.go | 2 +- 17 files changed, 168 insertions(+), 171 deletions(-) diff --git a/api/next.pb.txt b/api/next.pb.txt index 30b45c500..de855c830 100755 --- a/api/next.pb.txt +++ b/api/next.pb.txt @@ -155,14 +155,11 @@ file { json_name: "snapshotter" } field { - name: "rootfs" + name: "snapshot_key" number: 7 label: LABEL_OPTIONAL type: TYPE_STRING - options { - 65004: "RootFS" - } - json_name: "rootfs" + json_name: "snapshotKey" } field { name: "created_at" @@ -1216,14 +1213,11 @@ file { json_name: "labels" } field { - name: "rootfs" + name: "snapshot_key" number: 4 label: LABEL_OPTIONAL type: TYPE_STRING - options { - 65004: "RootFS" - } - json_name: "rootfs" + json_name: "snapshotKey" } nested_type { name: "LabelsEntry" diff --git a/api/services/containers/v1/containers.pb.go b/api/services/containers/v1/containers.pb.go index e03dab428..74b2bbe07 100644 --- a/api/services/containers/v1/containers.pb.go +++ b/api/services/containers/v1/containers.pb.go @@ -79,15 +79,17 @@ type Container struct { Spec *google_protobuf1.Any `protobuf:"bytes,5,opt,name=spec" json:"spec,omitempty"` // Snapshotter specifies the snapshotter name used for rootfs Snapshotter string `protobuf:"bytes,6,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"` - // RootFS specifies the snapshot key to use for the container's root + // SnapshotKey specifies the snapshot key to use for the container's root // filesystem. When starting a task from this container, a caller should // look up the mounts from the snapshot service and include those on the // task create request. // // Snapshots referenced in this field will not be garbage collected. // + // This field is set to empty when the rootfs is not a snapshot. + // // This field may be updated. - RootFS string `protobuf:"bytes,7,opt,name=rootfs,proto3" json:"rootfs,omitempty"` + SnapshotKey string `protobuf:"bytes,7,opt,name=snapshot_key,json=snapshotKey,proto3" json:"snapshot_key,omitempty"` // CreatedAt is the time the container was first created. CreatedAt time.Time `protobuf:"bytes,8,opt,name=created_at,json=createdAt,stdtime" json:"created_at"` // UpdatedAt is the last time the container was mutated. @@ -494,11 +496,11 @@ func (m *Container) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintContainers(dAtA, i, uint64(len(m.Snapshotter))) i += copy(dAtA[i:], m.Snapshotter) } - if len(m.RootFS) > 0 { + if len(m.SnapshotKey) > 0 { dAtA[i] = 0x3a i++ - i = encodeVarintContainers(dAtA, i, uint64(len(m.RootFS))) - i += copy(dAtA[i:], m.RootFS) + i = encodeVarintContainers(dAtA, i, uint64(len(m.SnapshotKey))) + i += copy(dAtA[i:], m.SnapshotKey) } dAtA[i] = 0x42 i++ @@ -862,7 +864,7 @@ func (m *Container) Size() (n int) { if l > 0 { n += 1 + l + sovContainers(uint64(l)) } - l = len(m.RootFS) + l = len(m.SnapshotKey) if l > 0 { n += 1 + l + sovContainers(uint64(l)) } @@ -1009,7 +1011,7 @@ func (this *Container) String() string { `Runtime:` + strings.Replace(fmt.Sprintf("%v", this.Runtime), "Container_Runtime", "Container_Runtime", 1) + `,`, `Spec:` + strings.Replace(fmt.Sprintf("%v", this.Spec), "Any", "google_protobuf1.Any", 1) + `,`, `Snapshotter:` + fmt.Sprintf("%v", this.Snapshotter) + `,`, - `RootFS:` + fmt.Sprintf("%v", this.RootFS) + `,`, + `SnapshotKey:` + fmt.Sprintf("%v", this.SnapshotKey) + `,`, `CreatedAt:` + strings.Replace(strings.Replace(this.CreatedAt.String(), "Timestamp", "google_protobuf4.Timestamp", 1), `&`, ``, 1) + `,`, `UpdatedAt:` + strings.Replace(strings.Replace(this.UpdatedAt.String(), "Timestamp", "google_protobuf4.Timestamp", 1), `&`, ``, 1) + `,`, `}`, @@ -1426,7 +1428,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RootFS", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SnapshotKey", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1451,7 +1453,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.RootFS = string(dAtA[iNdEx:postIndex]) + m.SnapshotKey = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 8: if wireType != 2 { @@ -2507,52 +2509,51 @@ func init() { } var fileDescriptorContainers = []byte{ - // 738 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcb, 0x92, 0xd2, 0x40, - 0x14, 0x9d, 0x40, 0x26, 0x0c, 0x97, 0x8d, 0xd5, 0x22, 0xc6, 0x58, 0x05, 0x98, 0x15, 0x0b, 0x0d, - 0x0e, 0x5a, 0x3a, 0x8f, 0xd5, 0x30, 0xaf, 0xb2, 0x6a, 0xc6, 0x9a, 0x6a, 0x75, 0xa3, 0x8b, 0x31, - 0x40, 0xc3, 0x44, 0x92, 0x74, 0x4c, 0x37, 0x54, 0x51, 0x2e, 0xf4, 0x13, 0xfc, 0x0b, 0x7f, 0x65, - 0x96, 0x2e, 0x5d, 0xcd, 0x83, 0x2f, 0xb1, 0xd2, 0x49, 0x26, 0xc8, 0xa3, 0x84, 0x51, 0x76, 0x7d, - 0xe9, 0x7b, 0xee, 0x3d, 0x39, 0xf7, 0xdc, 0x10, 0x38, 0xea, 0x58, 0xfc, 0xac, 0xd7, 0x30, 0x9a, - 0xd4, 0xa9, 0x36, 0xa9, 0xcb, 0x4d, 0xcb, 0x25, 0x7e, 0x6b, 0xf4, 0x68, 0x7a, 0x56, 0x95, 0x11, - 0xbf, 0x6f, 0x35, 0x09, 0x4b, 0x7e, 0x67, 0xd5, 0xfe, 0xfa, 0x48, 0x64, 0x78, 0x3e, 0xe5, 0x14, - 0x3d, 0x4a, 0x70, 0x46, 0x8c, 0x31, 0x46, 0xb2, 0xfa, 0xeb, 0x5a, 0xbe, 0x43, 0x3b, 0x54, 0x64, - 0x57, 0x83, 0x53, 0x08, 0xd4, 0x1e, 0x74, 0x28, 0xed, 0xd8, 0xa4, 0x2a, 0xa2, 0x46, 0xaf, 0x5d, - 0x35, 0xdd, 0x41, 0x74, 0xf5, 0x70, 0xfc, 0x8a, 0x38, 0x1e, 0x8f, 0x2f, 0xcb, 0xe3, 0x97, 0x6d, - 0x8b, 0xd8, 0xad, 0x53, 0xc7, 0x64, 0xdd, 0x28, 0xa3, 0x34, 0x9e, 0xc1, 0x2d, 0x87, 0x30, 0x6e, - 0x3a, 0x5e, 0x98, 0xa0, 0x5f, 0xca, 0x90, 0xdd, 0x8d, 0x29, 0xa2, 0x02, 0xa4, 0xac, 0x96, 0x2a, - 0x95, 0xa5, 0x4a, 0xb6, 0xae, 0x0c, 0x2f, 0x4a, 0xa9, 0x57, 0x7b, 0x38, 0x65, 0xb5, 0xd0, 0x09, - 0x28, 0xb6, 0xd9, 0x20, 0x36, 0x53, 0x53, 0xe5, 0x74, 0x25, 0x57, 0xdb, 0x30, 0xfe, 0xfa, 0xa8, - 0xc6, 0x4d, 0x55, 0xe3, 0x48, 0x40, 0xf7, 0x5d, 0xee, 0x0f, 0x70, 0x54, 0x07, 0xe5, 0x61, 0xd5, - 0x72, 0xcc, 0x0e, 0x51, 0xd3, 0x41, 0x33, 0x1c, 0x06, 0xe8, 0x35, 0x64, 0xfc, 0x9e, 0x1b, 0x70, - 0x54, 0xe5, 0xb2, 0x54, 0xc9, 0xd5, 0x9e, 0x2f, 0xd4, 0x08, 0x87, 0x58, 0x1c, 0x17, 0x41, 0x15, - 0x90, 0x99, 0x47, 0x9a, 0xea, 0xaa, 0x28, 0x96, 0x37, 0x42, 0x35, 0x8c, 0x58, 0x0d, 0x63, 0xc7, - 0x1d, 0x60, 0x91, 0x81, 0xca, 0x90, 0x63, 0xae, 0xe9, 0xb1, 0x33, 0xca, 0x39, 0xf1, 0x55, 0x45, - 0xb0, 0x1a, 0xfd, 0x09, 0xe9, 0xa0, 0xf8, 0x94, 0xf2, 0x36, 0x53, 0x33, 0x42, 0x1f, 0x18, 0x5e, - 0x94, 0x14, 0x4c, 0x29, 0x3f, 0x78, 0x83, 0xa3, 0x1b, 0xb4, 0x0b, 0xd0, 0xf4, 0x89, 0xc9, 0x49, - 0xeb, 0xd4, 0xe4, 0xea, 0x9a, 0xe8, 0xaa, 0x4d, 0x74, 0x7d, 0x1b, 0xcf, 0xa0, 0xbe, 0x76, 0x7e, - 0x51, 0x5a, 0xf9, 0x7e, 0x59, 0x92, 0x70, 0x36, 0xc2, 0xed, 0xf0, 0xa0, 0x48, 0xcf, 0x6b, 0xc5, - 0x45, 0xb2, 0x8b, 0x14, 0x89, 0x70, 0x3b, 0x5c, 0xdb, 0x84, 0xdc, 0x88, 0xec, 0xe8, 0x0e, 0xa4, - 0xbb, 0x64, 0x10, 0x4e, 0x16, 0x07, 0xc7, 0x60, 0x00, 0x7d, 0xd3, 0xee, 0x11, 0x35, 0x15, 0x0e, - 0x40, 0x04, 0x5b, 0xa9, 0x0d, 0x49, 0x3b, 0x86, 0x4c, 0x24, 0x24, 0x42, 0x20, 0xbb, 0xa6, 0x43, - 0x22, 0x9c, 0x38, 0x23, 0x03, 0x32, 0xd4, 0xe3, 0x16, 0x75, 0x99, 0x80, 0xce, 0x92, 0x35, 0x4e, - 0xd2, 0x9f, 0xc0, 0xdd, 0x43, 0xc2, 0x6f, 0x86, 0x84, 0xc9, 0xe7, 0x1e, 0x61, 0x7c, 0x96, 0xd5, - 0xf4, 0x33, 0xc8, 0xff, 0x99, 0xce, 0x3c, 0xea, 0x32, 0x82, 0x4e, 0x20, 0x7b, 0x33, 0x76, 0x01, - 0xcb, 0xd5, 0x1e, 0x2f, 0x62, 0x8e, 0xba, 0x1c, 0xc8, 0x84, 0x93, 0x22, 0xfa, 0x3a, 0xdc, 0x3b, - 0xb2, 0x58, 0xd2, 0x8a, 0xc5, 0xd4, 0x54, 0xc8, 0xb4, 0x2d, 0x9b, 0x13, 0x9f, 0xa9, 0x52, 0x39, - 0x5d, 0xc9, 0xe2, 0x38, 0xd4, 0x6d, 0x28, 0x8c, 0x43, 0x22, 0x7a, 0x18, 0x20, 0x69, 0x2c, 0x60, - 0xb7, 0xe3, 0x37, 0x52, 0x45, 0xff, 0x04, 0x85, 0x5d, 0xe1, 0x8a, 0x09, 0xf1, 0xfe, 0xbf, 0x18, - 0x5d, 0xb8, 0x3f, 0xd1, 0x6b, 0x69, 0xca, 0xff, 0x90, 0xa0, 0xf0, 0x4e, 0x58, 0x75, 0xf9, 0x4f, - 0x86, 0xb6, 0x21, 0x17, 0xae, 0x85, 0x78, 0x2f, 0x46, 0x9e, 0x9d, 0xdc, 0xa7, 0x83, 0xe0, 0xd5, - 0x79, 0x6c, 0xb2, 0x2e, 0x8e, 0xb6, 0x2f, 0x38, 0x07, 0xb2, 0x4c, 0x10, 0x5d, 0x9a, 0x2c, 0x4f, - 0xa1, 0xb0, 0x47, 0x6c, 0x32, 0x45, 0x95, 0x19, 0xcb, 0x52, 0xbb, 0x92, 0x01, 0x12, 0x33, 0xa2, - 0x3e, 0xa4, 0x0f, 0x09, 0x47, 0x2f, 0xe6, 0xa0, 0x31, 0x65, 0x25, 0xb5, 0x97, 0x0b, 0xe3, 0x22, - 0x29, 0xbe, 0x80, 0x1c, 0xac, 0x05, 0x9a, 0xe7, 0x6f, 0x61, 0xea, 0xca, 0x69, 0x9b, 0xb7, 0x40, - 0x46, 0xcd, 0xbf, 0x82, 0x12, 0x3a, 0x17, 0xcd, 0x53, 0x64, 0xfa, 0x42, 0x69, 0x5b, 0xb7, 0x81, - 0x26, 0x04, 0x42, 0x8f, 0xcc, 0x45, 0x60, 0xba, 0xef, 0xe7, 0x22, 0x30, 0xcb, 0x89, 0x1f, 0x40, - 0x09, 0x7d, 0x33, 0x17, 0x81, 0xe9, 0x16, 0xd3, 0x0a, 0x13, 0x1b, 0xb1, 0x1f, 0x7c, 0x69, 0xd4, - 0x3f, 0x9e, 0x5f, 0x17, 0x57, 0x7e, 0x5d, 0x17, 0x57, 0xbe, 0x0d, 0x8b, 0xd2, 0xf9, 0xb0, 0x28, - 0xfd, 0x1c, 0x16, 0xa5, 0xab, 0x61, 0x51, 0x7a, 0x7f, 0xf0, 0x0f, 0x1f, 0x4f, 0xdb, 0x49, 0xd4, - 0x50, 0x44, 0xc7, 0x67, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xef, 0xc2, 0x41, 0x7b, 0x8d, 0x09, - 0x00, 0x00, + // 730 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcb, 0x72, 0x12, 0x41, + 0x14, 0xcd, 0xc0, 0x04, 0xc2, 0xc5, 0x85, 0xd5, 0x22, 0x8e, 0x63, 0x15, 0x10, 0x56, 0x2c, 0x74, + 0x30, 0x68, 0x69, 0x1e, 0xab, 0x90, 0x57, 0x59, 0x26, 0x56, 0xaa, 0x4b, 0x37, 0xba, 0x88, 0x0d, + 0x74, 0xc8, 0xc8, 0xbc, 0x9c, 0x6e, 0xa8, 0xa2, 0x5c, 0xe8, 0x27, 0xf8, 0x17, 0xfe, 0x4a, 0x96, + 0x2e, 0x5d, 0xc5, 0x84, 0x2f, 0xb1, 0xba, 0x67, 0x26, 0x43, 0x78, 0x94, 0x10, 0x65, 0x77, 0x2f, + 0x7d, 0xcf, 0xbd, 0x67, 0x4e, 0x9f, 0x3b, 0x0c, 0x1c, 0xb6, 0x4d, 0x7e, 0xd6, 0x6d, 0x18, 0x4d, + 0xd7, 0xae, 0x36, 0x5d, 0x87, 0x13, 0xd3, 0xa1, 0x7e, 0x6b, 0x38, 0x24, 0x9e, 0x59, 0x65, 0xd4, + 0xef, 0x99, 0x4d, 0xca, 0xe2, 0xdf, 0x59, 0xb5, 0xb7, 0x36, 0x94, 0x19, 0x9e, 0xef, 0x72, 0x17, + 0xad, 0xc6, 0x38, 0x23, 0xc2, 0x18, 0x43, 0x55, 0xbd, 0x35, 0x3d, 0xd7, 0x76, 0xdb, 0xae, 0xac, + 0xae, 0x8a, 0x28, 0x00, 0xea, 0x0f, 0xdb, 0xae, 0xdb, 0xb6, 0x68, 0x55, 0x66, 0x8d, 0xee, 0x69, + 0x95, 0x38, 0xfd, 0xf0, 0xe8, 0xd1, 0xe8, 0x11, 0xb5, 0x3d, 0x1e, 0x1d, 0x96, 0x46, 0x0f, 0x4f, + 0x4d, 0x6a, 0xb5, 0x4e, 0x6c, 0xc2, 0x3a, 0x61, 0x45, 0x71, 0xb4, 0x82, 0x9b, 0x36, 0x65, 0x9c, + 0xd8, 0x5e, 0x50, 0x50, 0xbe, 0x50, 0x21, 0xb3, 0x13, 0x51, 0x44, 0x79, 0x48, 0x98, 0x2d, 0x4d, + 0x29, 0x29, 0x95, 0x4c, 0x3d, 0x35, 0xb8, 0x28, 0x26, 0x5e, 0xed, 0xe2, 0x84, 0xd9, 0x42, 0xc7, + 0x90, 0xb2, 0x48, 0x83, 0x5a, 0x4c, 0x4b, 0x94, 0x92, 0x95, 0x6c, 0x6d, 0xdd, 0xf8, 0xeb, 0xa3, + 0x1a, 0xd7, 0x5d, 0x8d, 0x43, 0x09, 0xdd, 0x73, 0xb8, 0xdf, 0xc7, 0x61, 0x1f, 0x94, 0x83, 0x65, + 0xd3, 0x26, 0x6d, 0xaa, 0x25, 0xc5, 0x30, 0x1c, 0x24, 0xe8, 0x0d, 0xa4, 0xfd, 0xae, 0x23, 0x38, + 0x6a, 0x6a, 0x49, 0xa9, 0x64, 0x6b, 0xcf, 0xe7, 0x1a, 0x84, 0x03, 0x2c, 0x8e, 0x9a, 0xa0, 0x0a, + 0xa8, 0xcc, 0xa3, 0x4d, 0x6d, 0x59, 0x36, 0xcb, 0x19, 0x81, 0x1a, 0x46, 0xa4, 0x86, 0xb1, 0xed, + 0xf4, 0xb1, 0xac, 0x40, 0x25, 0xc8, 0x32, 0x87, 0x78, 0xec, 0xcc, 0xe5, 0x9c, 0xfa, 0x5a, 0x4a, + 0xb2, 0x1a, 0xfe, 0x09, 0xad, 0xc2, 0x9d, 0x28, 0x3d, 0xe9, 0xd0, 0xbe, 0x96, 0xbe, 0x59, 0xf2, + 0x9a, 0xf6, 0xd1, 0x0e, 0x40, 0xd3, 0xa7, 0x84, 0xd3, 0xd6, 0x09, 0xe1, 0xda, 0x8a, 0x1c, 0xaa, + 0x8f, 0x0d, 0x7d, 0x1b, 0x5d, 0x41, 0x7d, 0xe5, 0xfc, 0xa2, 0xb8, 0xf4, 0xfd, 0x77, 0x51, 0xc1, + 0x99, 0x10, 0xb7, 0xcd, 0x45, 0x93, 0xae, 0xd7, 0x8a, 0x9a, 0x64, 0xe6, 0x69, 0x12, 0xe2, 0xb6, + 0xb9, 0xbe, 0x01, 0xd9, 0x21, 0xd5, 0xd1, 0x5d, 0x48, 0x0a, 0xca, 0xf2, 0x62, 0xb1, 0x08, 0x85, + 0xfe, 0x3d, 0x62, 0x75, 0xa9, 0x96, 0x08, 0xf4, 0x97, 0xc9, 0x66, 0x62, 0x5d, 0xd1, 0x8f, 0x20, + 0x1d, 0xea, 0x88, 0x10, 0xa8, 0x0e, 0xb1, 0x69, 0x88, 0x93, 0x31, 0x32, 0x20, 0xed, 0x7a, 0xdc, + 0x74, 0x1d, 0x26, 0xa1, 0xd3, 0x54, 0x8d, 0x8a, 0xca, 0x4f, 0xe0, 0xde, 0x01, 0xe5, 0xd7, 0x77, + 0x84, 0xe9, 0xe7, 0x2e, 0x65, 0x7c, 0x9a, 0xd3, 0xca, 0x67, 0x90, 0xbb, 0x59, 0xce, 0x3c, 0xd7, + 0x61, 0x14, 0x1d, 0x43, 0xe6, 0xfa, 0xd6, 0x25, 0x2c, 0x5b, 0x7b, 0x3c, 0x8f, 0x37, 0xea, 0xaa, + 0x90, 0x09, 0xc7, 0x4d, 0xca, 0x6b, 0x70, 0xff, 0xd0, 0x64, 0xf1, 0x28, 0x16, 0x51, 0xd3, 0x20, + 0x7d, 0x6a, 0x5a, 0x9c, 0xfa, 0x4c, 0x53, 0x4a, 0xc9, 0x4a, 0x06, 0x47, 0x69, 0xd9, 0x82, 0xfc, + 0x28, 0x24, 0xa4, 0x87, 0x01, 0xe2, 0xc1, 0x12, 0x76, 0x3b, 0x7e, 0x43, 0x5d, 0xca, 0x9f, 0x20, + 0xbf, 0x23, 0x5d, 0x31, 0x26, 0xde, 0xff, 0x17, 0xa3, 0x03, 0x0f, 0xc6, 0x66, 0x2d, 0x4c, 0xf9, + 0x1f, 0x0a, 0xe4, 0xdf, 0x49, 0xab, 0x2e, 0xfe, 0xc9, 0xd0, 0x16, 0x64, 0x83, 0xb5, 0x90, 0xaf, + 0xc5, 0xd0, 0xb3, 0xe3, 0xfb, 0xb4, 0x2f, 0xde, 0x9c, 0x47, 0x84, 0x75, 0x70, 0xb8, 0x7d, 0x22, + 0x16, 0xb2, 0x8c, 0x11, 0x5d, 0x98, 0x2c, 0x4f, 0x21, 0xbf, 0x4b, 0x2d, 0x3a, 0x41, 0x95, 0x29, + 0xcb, 0x52, 0xbb, 0x54, 0x01, 0x62, 0x33, 0xa2, 0x1e, 0x24, 0x0f, 0x28, 0x47, 0x2f, 0x66, 0xa0, + 0x31, 0x61, 0x25, 0xf5, 0x97, 0x73, 0xe3, 0x42, 0x29, 0xbe, 0x80, 0x2a, 0xd6, 0x02, 0xcd, 0xf2, + 0xaf, 0x30, 0x71, 0xe5, 0xf4, 0x8d, 0x5b, 0x20, 0xc3, 0xe1, 0x5f, 0x21, 0x15, 0x38, 0x17, 0xcd, + 0xd2, 0x64, 0xf2, 0x42, 0xe9, 0x9b, 0xb7, 0x81, 0xc6, 0x04, 0x02, 0x8f, 0xcc, 0x44, 0x60, 0xb2, + 0xef, 0x67, 0x22, 0x30, 0xcd, 0x89, 0x1f, 0x20, 0x15, 0xf8, 0x66, 0x26, 0x02, 0x93, 0x2d, 0xa6, + 0xe7, 0xc7, 0x36, 0x62, 0x4f, 0x7c, 0x68, 0xd4, 0x3f, 0x9e, 0x5f, 0x15, 0x96, 0x7e, 0x5d, 0x15, + 0x96, 0xbe, 0x0d, 0x0a, 0xca, 0xf9, 0xa0, 0xa0, 0xfc, 0x1c, 0x14, 0x94, 0xcb, 0x41, 0x41, 0x79, + 0xbf, 0xff, 0x0f, 0xdf, 0x4e, 0x5b, 0x71, 0xd6, 0x48, 0xc9, 0x89, 0xcf, 0xfe, 0x04, 0x00, 0x00, + 0xff, 0xff, 0x7e, 0x6d, 0xca, 0xbd, 0x8c, 0x09, 0x00, 0x00, } diff --git a/api/services/containers/v1/containers.proto b/api/services/containers/v1/containers.proto index e0f0e267b..572ecde12 100644 --- a/api/services/containers/v1/containers.proto +++ b/api/services/containers/v1/containers.proto @@ -67,15 +67,17 @@ message Container { // Snapshotter specifies the snapshotter name used for rootfs string snapshotter = 6; - // RootFS specifies the snapshot key to use for the container's root + // SnapshotKey specifies the snapshot key to use for the container's root // filesystem. When starting a task from this container, a caller should // look up the mounts from the snapshot service and include those on the // task create request. // // Snapshots referenced in this field will not be garbage collected. // + // This field is set to empty when the rootfs is not a snapshot. + // // This field may be updated. - string rootfs = 7 [(gogoproto.customname) = "RootFS"]; + string snapshot_key = 7; // CreatedAt is the time the container was first created. google.protobuf.Timestamp created_at = 8 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; diff --git a/api/services/events/v1/container.pb.go b/api/services/events/v1/container.pb.go index 75ce359b6..2533b1d43 100644 --- a/api/services/events/v1/container.pb.go +++ b/api/services/events/v1/container.pb.go @@ -94,10 +94,10 @@ func (*ContainerCreate_Runtime) Descriptor() ([]byte, []int) { } type ContainerUpdate struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Image string `protobuf:"bytes,2,opt,name=image,proto3" json:"image,omitempty"` - Labels map[string]string `protobuf:"bytes,3,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - RootFS string `protobuf:"bytes,4,opt,name=rootfs,proto3" json:"rootfs,omitempty"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Image string `protobuf:"bytes,2,opt,name=image,proto3" json:"image,omitempty"` + Labels map[string]string `protobuf:"bytes,3,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + SnapshotKey string `protobuf:"bytes,4,opt,name=snapshot_key,json=snapshotKey,proto3" json:"snapshot_key,omitempty"` } func (m *ContainerUpdate) Reset() { *m = ContainerUpdate{} } @@ -194,8 +194,8 @@ func (m *ContainerUpdate) Field(fieldpath []string) (string, bool) { } value, ok := m.Labels[strings.Join(fieldpath[1:], ".")] return value, ok - case "rootfs": - return string(m.RootFS), len(m.RootFS) > 0 + case "snapshot_key": + return string(m.SnapshotKey), len(m.SnapshotKey) > 0 } return "", false } @@ -331,11 +331,11 @@ func (m *ContainerUpdate) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], v) } } - if len(m.RootFS) > 0 { + if len(m.SnapshotKey) > 0 { dAtA[i] = 0x22 i++ - i = encodeVarintContainer(dAtA, i, uint64(len(m.RootFS))) - i += copy(dAtA[i:], m.RootFS) + i = encodeVarintContainer(dAtA, i, uint64(len(m.SnapshotKey))) + i += copy(dAtA[i:], m.SnapshotKey) } return i, nil } @@ -442,7 +442,7 @@ func (m *ContainerUpdate) Size() (n int) { n += mapEntrySize + 1 + sovContainer(uint64(mapEntrySize)) } } - l = len(m.RootFS) + l = len(m.SnapshotKey) if l > 0 { n += 1 + l + sovContainer(uint64(l)) } @@ -513,7 +513,7 @@ func (this *ContainerUpdate) String() string { `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `Image:` + fmt.Sprintf("%v", this.Image) + `,`, `Labels:` + mapStringForLabels + `,`, - `RootFS:` + fmt.Sprintf("%v", this.RootFS) + `,`, + `SnapshotKey:` + fmt.Sprintf("%v", this.SnapshotKey) + `,`, `}`, }, "") return s @@ -994,7 +994,7 @@ func (m *ContainerUpdate) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RootFS", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SnapshotKey", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1019,7 +1019,7 @@ func (m *ContainerUpdate) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.RootFS = string(dAtA[iNdEx:postIndex]) + m.SnapshotKey = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1231,32 +1231,32 @@ func init() { } var fileDescriptorContainer = []byte{ - // 429 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x4d, 0x8b, 0xd4, 0x40, - 0x10, 0xdd, 0xce, 0xac, 0x19, 0xec, 0x39, 0x28, 0xcd, 0x20, 0x71, 0xc0, 0xec, 0x30, 0xa7, 0xf1, - 0xd2, 0xcd, 0x8e, 0x20, 0xba, 0x82, 0xe8, 0xee, 0xaa, 0x08, 0x0a, 0xd2, 0xe2, 0x45, 0xbc, 0xf4, - 0x4c, 0x6a, 0xb2, 0x8d, 0x49, 0x77, 0x48, 0x3a, 0x81, 0xdc, 0xfc, 0x29, 0xfe, 0x9c, 0x3d, 0x7a, - 0xf4, 0xb4, 0xec, 0xe6, 0x27, 0x88, 0x3f, 0x40, 0xd2, 0x9d, 0xec, 0x06, 0xc1, 0xcf, 0xdb, 0xab, - 0xd4, 0x7b, 0x55, 0xef, 0x55, 0x1a, 0xbf, 0x88, 0xa5, 0x39, 0x29, 0xd7, 0x74, 0xa3, 0x53, 0xb6, - 0xd1, 0xca, 0x08, 0xa9, 0x20, 0x8f, 0x86, 0x50, 0x64, 0x92, 0x15, 0x90, 0x57, 0x72, 0x03, 0x05, - 0x83, 0x0a, 0x94, 0x29, 0x58, 0xb5, 0x7f, 0xc5, 0xa0, 0x59, 0xae, 0x8d, 0x26, 0x77, 0xae, 0x24, - 0xb4, 0xa7, 0x53, 0x47, 0xa7, 0xd5, 0xfe, 0x6c, 0x1a, 0xeb, 0x58, 0x5b, 0x26, 0x6b, 0x91, 0x13, - 0xcd, 0x6e, 0xc7, 0x5a, 0xc7, 0x09, 0x30, 0x5b, 0xad, 0xcb, 0x2d, 0x13, 0xaa, 0xee, 0x5a, 0x4f, - 0xfe, 0x68, 0xec, 0x52, 0x94, 0x25, 0x65, 0x2c, 0x15, 0xdb, 0x4a, 0x48, 0xa2, 0x4c, 0x98, 0x13, - 0x37, 0x61, 0x71, 0x8e, 0xf0, 0x8d, 0xa3, 0x9e, 0x7e, 0x94, 0x83, 0x30, 0x40, 0x6e, 0x61, 0x4f, - 0x46, 0x01, 0x9a, 0xa3, 0xe5, 0xf5, 0x43, 0xbf, 0x39, 0xdb, 0xf3, 0x5e, 0x1e, 0x73, 0x4f, 0x46, - 0x64, 0x8a, 0xaf, 0xc9, 0x54, 0xc4, 0x10, 0x78, 0x6d, 0x8b, 0xbb, 0x82, 0xbc, 0xc1, 0xe3, 0xbc, - 0x54, 0x46, 0xa6, 0x10, 0x8c, 0xe6, 0x68, 0x39, 0x59, 0xdd, 0xa7, 0xbf, 0x4d, 0x49, 0x7f, 0x5a, - 0x47, 0xb9, 0x53, 0xf3, 0x7e, 0xcc, 0xec, 0x35, 0x1e, 0x77, 0xdf, 0x08, 0xc1, 0xbb, 0x4a, 0xa4, - 0xe0, 0xcc, 0x70, 0x8b, 0x09, 0xc5, 0x63, 0x9d, 0x19, 0xa9, 0x55, 0x61, 0x8d, 0x4c, 0x56, 0x53, - 0xea, 0x2e, 0x44, 0xfb, 0xb0, 0xf4, 0xa9, 0xaa, 0x79, 0x4f, 0x5a, 0x7c, 0x1b, 0x46, 0x7c, 0x97, - 0x45, 0xff, 0x1e, 0x91, 0x63, 0x3f, 0x11, 0x6b, 0x48, 0x8a, 0x60, 0x34, 0x1f, 0x2d, 0x27, 0xab, - 0x83, 0xbf, 0x4d, 0xe8, 0xb6, 0xd1, 0x57, 0x56, 0xfc, 0x4c, 0x99, 0xbc, 0xe6, 0xdd, 0x24, 0xb2, - 0xc0, 0x7e, 0xae, 0xb5, 0xd9, 0x16, 0xc1, 0xae, 0x75, 0x81, 0x9b, 0xb3, 0x3d, 0x9f, 0x6b, 0x6d, - 0x9e, 0xbf, 0xe5, 0x5d, 0x67, 0xf6, 0x10, 0x4f, 0x06, 0x52, 0x72, 0x13, 0x8f, 0x3e, 0x42, 0xdd, - 0xdd, 0xa2, 0x85, 0xad, 0xdd, 0x4a, 0x24, 0xe5, 0xa5, 0x5d, 0x5b, 0x1c, 0x78, 0x0f, 0xd0, 0xe2, - 0xee, 0x20, 0xf3, 0x31, 0x24, 0xf0, 0xeb, 0xcc, 0x87, 0x1f, 0x4e, 0x2f, 0xc2, 0x9d, 0xaf, 0x17, - 0xe1, 0xce, 0xa7, 0x26, 0x44, 0xa7, 0x4d, 0x88, 0xbe, 0x34, 0x21, 0x3a, 0x6f, 0x42, 0xf4, 0xf9, - 0x7b, 0x88, 0xde, 0x3f, 0xfe, 0xcf, 0xb7, 0xff, 0xc8, 0xa1, 0xb5, 0x6f, 0x7f, 0xca, 0xbd, 0x1f, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xae, 0x41, 0x3c, 0x44, 0x03, 0x00, 0x00, + // 427 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x5d, 0x8b, 0xd4, 0x30, + 0x14, 0xdd, 0x74, 0xd6, 0x19, 0x4c, 0x05, 0x25, 0x0c, 0x52, 0x07, 0xac, 0xe3, 0x3c, 0x8d, 0x2f, + 0x09, 0x3b, 0x82, 0xe8, 0x0a, 0xa2, 0xbb, 0x2b, 0x22, 0x2a, 0x48, 0xc0, 0x17, 0x11, 0x24, 0x9d, + 0xde, 0xed, 0x04, 0xdb, 0xa4, 0xb4, 0x69, 0xa1, 0x6f, 0xfe, 0x14, 0x7f, 0xce, 0x3e, 0xfa, 0xe8, + 0x93, 0xec, 0xf6, 0x1f, 0x08, 0xfe, 0x00, 0x69, 0x32, 0xdd, 0x2d, 0x82, 0x9f, 0x6f, 0xe7, 0xe6, + 0x9e, 0x73, 0xef, 0x39, 0xb7, 0xc5, 0xcf, 0x12, 0x69, 0x36, 0x55, 0x44, 0xd7, 0x3a, 0x63, 0x6b, + 0xad, 0x8c, 0x90, 0x0a, 0x8a, 0x78, 0x08, 0x45, 0x2e, 0x59, 0x09, 0x45, 0x2d, 0xd7, 0x50, 0x32, + 0xa8, 0x41, 0x99, 0x92, 0xd5, 0x7b, 0x17, 0x0c, 0x9a, 0x17, 0xda, 0x68, 0x72, 0xf3, 0x42, 0x42, + 0x7b, 0x3a, 0x75, 0x74, 0x5a, 0xef, 0xcd, 0xa6, 0x89, 0x4e, 0xb4, 0x65, 0xb2, 0x0e, 0x39, 0xd1, + 0xec, 0x46, 0xa2, 0x75, 0x92, 0x02, 0xb3, 0x55, 0x54, 0x1d, 0x33, 0xa1, 0x9a, 0x6d, 0xeb, 0xf1, + 0x1f, 0x8d, 0x9d, 0x8b, 0xf2, 0xb4, 0x4a, 0xa4, 0x62, 0xc7, 0x12, 0xd2, 0x38, 0x17, 0x66, 0xe3, + 0x26, 0x2c, 0x4e, 0x11, 0xbe, 0x7a, 0xd8, 0xd3, 0x0f, 0x0b, 0x10, 0x06, 0xc8, 0x75, 0xec, 0xc9, + 0x38, 0x40, 0x73, 0xb4, 0xbc, 0x7c, 0x30, 0x6e, 0xbf, 0xde, 0xf2, 0x9e, 0x1f, 0x71, 0x4f, 0xc6, + 0x64, 0x8a, 0x2f, 0xc9, 0x4c, 0x24, 0x10, 0x78, 0x5d, 0x8b, 0xbb, 0x82, 0xbc, 0xc6, 0x93, 0xa2, + 0x52, 0x46, 0x66, 0x10, 0x8c, 0xe6, 0x68, 0xe9, 0xaf, 0xee, 0xd1, 0xdf, 0xa6, 0xa4, 0x3f, 0xad, + 0xa3, 0xdc, 0xa9, 0x79, 0x3f, 0x66, 0xf6, 0x0a, 0x4f, 0xb6, 0x6f, 0x84, 0xe0, 0x5d, 0x25, 0x32, + 0x70, 0x66, 0xb8, 0xc5, 0x84, 0xe2, 0x89, 0xce, 0x8d, 0xd4, 0xaa, 0xb4, 0x46, 0xfc, 0xd5, 0x94, + 0xba, 0x0b, 0xd1, 0x3e, 0x2c, 0x7d, 0xa2, 0x1a, 0xde, 0x93, 0x16, 0xdf, 0x86, 0x11, 0xdf, 0xe4, + 0xf1, 0xbf, 0x47, 0xe4, 0x78, 0x9c, 0x8a, 0x08, 0xd2, 0x32, 0x18, 0xcd, 0x47, 0x4b, 0x7f, 0xb5, + 0xff, 0xb7, 0x09, 0xdd, 0x36, 0xfa, 0xd2, 0x8a, 0x9f, 0x2a, 0x53, 0x34, 0x7c, 0x3b, 0x89, 0xdc, + 0xc6, 0x57, 0x4a, 0x25, 0xf2, 0x72, 0xa3, 0xcd, 0xfb, 0x0f, 0xd0, 0x04, 0xbb, 0x76, 0xa1, 0xdf, + 0xbf, 0xbd, 0x80, 0x66, 0xf6, 0x00, 0xfb, 0x03, 0x25, 0xb9, 0x86, 0x47, 0x1d, 0xd1, 0x9d, 0xa2, + 0x83, 0x9d, 0xdb, 0x5a, 0xa4, 0xd5, 0xb9, 0x5b, 0x5b, 0xec, 0x7b, 0xf7, 0xd1, 0xe2, 0xce, 0x20, + 0xf2, 0x11, 0xa4, 0xf0, 0xeb, 0xc8, 0x07, 0xef, 0x4e, 0xce, 0xc2, 0x9d, 0x2f, 0x67, 0xe1, 0xce, + 0xc7, 0x36, 0x44, 0x27, 0x6d, 0x88, 0x3e, 0xb7, 0x21, 0x3a, 0x6d, 0x43, 0xf4, 0xe9, 0x7b, 0x88, + 0xde, 0x3e, 0xfa, 0xcf, 0x5f, 0xff, 0xa1, 0x43, 0xd1, 0xd8, 0x7e, 0x93, 0xbb, 0x3f, 0x02, 0x00, + 0x00, 0xff, 0xff, 0x26, 0x0d, 0x55, 0x1c, 0x43, 0x03, 0x00, 0x00, } diff --git a/api/services/events/v1/container.proto b/api/services/events/v1/container.proto index eec5ad9fb..ca8acb8b9 100644 --- a/api/services/events/v1/container.proto +++ b/api/services/events/v1/container.proto @@ -23,7 +23,7 @@ message ContainerUpdate { string id = 1; string image = 2; map labels = 3; - string rootfs = 4 [(gogoproto.customname) = "RootFS"]; + string snapshot_key = 4; } message ContainerDelete { diff --git a/container.go b/container.go index ee507f669..a9657d1e9 100644 --- a/container.go +++ b/container.go @@ -173,13 +173,13 @@ func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...Ne Stdout: cfg.Stdout, Stderr: cfg.Stderr, } - if c.c.RootFS != "" { + if c.c.SnapshotKey != "" { if c.c.Snapshotter == "" { return nil, errors.Wrapf(errdefs.ErrInvalidArgument, "unable to resolve rootfs mounts without snapshotter on container") } // get the rootfs from the snapshotter and add it to the request - mounts, err := c.client.SnapshotService(c.c.Snapshotter).Mounts(ctx, c.c.RootFS) + mounts, err := c.client.SnapshotService(c.c.Snapshotter).Mounts(ctx, c.c.SnapshotKey) if err != nil { return nil, err } diff --git a/container_opts.go b/container_opts.go index 4600dcf26..008adfca2 100644 --- a/container_opts.go +++ b/container_opts.go @@ -70,7 +70,7 @@ func WithSnapshot(id string) NewContainerOpts { if _, err := client.SnapshotService(c.Snapshotter).Mounts(ctx, id); err != nil { return err } - c.RootFS = id + c.SnapshotKey = id return nil } } @@ -87,19 +87,19 @@ func WithNewSnapshot(id string, i Image) NewContainerOpts { if _, err := client.SnapshotService(c.Snapshotter).Prepare(ctx, id, identity.ChainID(diffIDs).String()); err != nil { return err } - c.RootFS = id + c.SnapshotKey = id c.Image = i.Name() return nil } } -// WithSnapshotCleanup deletes the rootfs allocated for the container +// WithSnapshotCleanup deletes the rootfs snapshot allocated for the container func WithSnapshotCleanup(ctx context.Context, client *Client, c containers.Container) error { - if c.RootFS != "" { + if c.SnapshotKey != "" { if c.Snapshotter == "" { - return errors.Wrapf(errdefs.ErrInvalidArgument, "container.Snapshotter must be set to cleanup rootfs") + return errors.Wrapf(errdefs.ErrInvalidArgument, "container.Snapshotter must be set to cleanup rootfs snapshot") } - return client.SnapshotService(c.Snapshotter).Remove(ctx, c.RootFS) + return client.SnapshotService(c.Snapshotter).Remove(ctx, c.SnapshotKey) } return nil } @@ -116,7 +116,7 @@ func WithNewSnapshotView(id string, i Image) NewContainerOpts { if _, err := client.SnapshotService(c.Snapshotter).View(ctx, id, identity.ChainID(diffIDs).String()); err != nil { return err } - c.RootFS = id + c.SnapshotKey = id c.Image = i.Name() return nil } diff --git a/container_opts_unix.go b/container_opts_unix.go index 73e5486bd..2e06b3a1c 100644 --- a/container_opts_unix.go +++ b/container_opts_unix.go @@ -22,7 +22,7 @@ import ( // WithCheckpoint allows a container to be created from the checkpointed information // provided by the descriptor. The image, snapshot, and runtime specifications are // restored on the container -func WithCheckpoint(desc v1.Descriptor, rootfsID string) NewContainerOpts { +func WithCheckpoint(desc v1.Descriptor, snapshotKey string) NewContainerOpts { // set image and rw, and spec return func(ctx context.Context, client *Client, c *containers.Container) error { id := desc.Digest @@ -47,7 +47,7 @@ func WithCheckpoint(desc v1.Descriptor, rootfsID string) NewContainerOpts { return err } setSnapshotterIfEmpty(c) - if _, err := client.SnapshotService(c.Snapshotter).Prepare(ctx, rootfsID, identity.ChainID(diffIDs).String()); err != nil { + if _, err := client.SnapshotService(c.Snapshotter).Prepare(ctx, snapshotKey, identity.ChainID(diffIDs).String()); err != nil { if !errdefs.IsAlreadyExists(err) { return err } @@ -67,7 +67,7 @@ func WithCheckpoint(desc v1.Descriptor, rootfsID string) NewContainerOpts { } if rw != nil { // apply the rw snapshot to the new rw layer - mounts, err := client.SnapshotService(c.Snapshotter).Mounts(ctx, rootfsID) + mounts, err := client.SnapshotService(c.Snapshotter).Mounts(ctx, snapshotKey) if err != nil { return err } @@ -75,7 +75,7 @@ func WithCheckpoint(desc v1.Descriptor, rootfsID string) NewContainerOpts { return err } } - c.RootFS = rootfsID + c.SnapshotKey = snapshotKey return nil } } diff --git a/containers/containers.go b/containers/containers.go index cc44f2bbf..6ad161f8f 100644 --- a/containers/containers.go +++ b/containers/containers.go @@ -39,13 +39,13 @@ type Container struct { // This field is required but mutable. Spec *types.Any - // RootFS specifies the snapshot key to use for the container's root + // SnapshotKey specifies the snapshot key to use for the container's root // filesystem. When starting a task from this container, a caller should // look up the mounts from the snapshot service and include those on the // task create request. // // This field is not required but immutable. - RootFS string + SnapshotKey string // Snapshotter specifies the snapshotter name used for rootfs // diff --git a/containerstore.go b/containerstore.go index 9ab8ca162..8d75fbe9e 100644 --- a/containerstore.go +++ b/containerstore.go @@ -96,7 +96,7 @@ func containerToProto(container *containers.Container) containersapi.Container { }, Spec: container.Spec, Snapshotter: container.Snapshotter, - RootFS: container.RootFS, + SnapshotKey: container.SnapshotKey, } } @@ -115,7 +115,7 @@ func containerFromProto(containerpb *containersapi.Container) containers.Contain Runtime: runtime, Spec: containerpb.Spec, Snapshotter: containerpb.Snapshotter, - RootFS: containerpb.RootFS, + SnapshotKey: containerpb.SnapshotKey, } } diff --git a/metadata/buckets.go b/metadata/buckets.go index d66c17277..57dcb89e5 100644 --- a/metadata/buckets.go +++ b/metadata/buckets.go @@ -47,7 +47,7 @@ var ( bucketKeyParent = []byte("parent") bucketKeyOptions = []byte("options") bucketKeySpec = []byte("spec") - bucketKeyRootFS = []byte("rootfs") + bucketKeySnapshotKey = []byte("snapshotKey") bucketKeySnapshotter = []byte("snapshotter") bucketKeyTarget = []byte("target") ) diff --git a/metadata/containers.go b/metadata/containers.go index f525ebab4..2f384c45a 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -155,8 +155,8 @@ func (s *containerStore) Update(ctx context.Context, container containers.Contai return containers.Container{}, errors.Wrapf(errdefs.ErrInvalidArgument, "container.Image field is immutable") } - if updated.RootFS != container.RootFS { - return containers.Container{}, errors.Wrapf(errdefs.ErrInvalidArgument, "container.RootFS field is immutable") + if updated.SnapshotKey != container.SnapshotKey { + return containers.Container{}, errors.Wrapf(errdefs.ErrInvalidArgument, "container.SnapshotKey field is immutable") } if updated.Snapshotter != container.Snapshotter { @@ -235,8 +235,8 @@ func validateContainer(container *containers.Container) error { return errors.Wrapf(errdefs.ErrInvalidArgument, "container.Spec must be set") } - if container.RootFS != "" && container.Snapshotter == "" { - return errors.Wrapf(errdefs.ErrInvalidArgument, "container.Snapshotter must be set if container.RootFS is set") + if container.SnapshotKey != "" && container.Snapshotter == "" { + return errors.Wrapf(errdefs.ErrInvalidArgument, "container.Snapshotter must be set if container.SnapshotKey is set") } return nil @@ -284,8 +284,8 @@ func readContainer(container *containers.Container, bkt *bolt.Bucket) error { return err } container.Spec = &any - case string(bucketKeyRootFS): - container.RootFS = string(v) + case string(bucketKeySnapshotKey): + container.SnapshotKey = string(v) case string(bucketKeySnapshotter): container.Snapshotter = string(v) } @@ -313,7 +313,7 @@ func writeContainer(bkt *bolt.Bucket, container *containers.Container) error { for _, v := range [][2][]byte{ {bucketKeyImage, []byte(container.Image)}, {bucketKeySnapshotter, []byte(container.Snapshotter)}, - {bucketKeyRootFS, []byte(container.RootFS)}, + {bucketKeySnapshotKey, []byte(container.SnapshotKey)}, } { if err := bkt.Put(v[0], v[1]); err != nil { return err diff --git a/metadata/containers_test.go b/metadata/containers_test.go index f5fa6bd01..11233c409 100644 --- a/metadata/containers_test.go +++ b/metadata/containers_test.go @@ -45,7 +45,7 @@ func TestContainersList(t *testing.T) { "odd": fmt.Sprint(i%2 != 0), }, Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -194,7 +194,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { name: "UpdateIDFail", original: containers.Container{ Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -213,7 +213,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { { name: "UpdateRuntimeFail", original: containers.Container{ - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Spec: encoded, Runtime: containers.RuntimeInfo{ @@ -233,7 +233,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { name: "UpdateRuntimeClearFail", original: containers.Container{ Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -249,7 +249,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { name: "UpdateFail", original: containers.Container{ Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ @@ -262,7 +262,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { Runtime: containers.RuntimeInfo{ Name: "testruntime", }, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", // try to clear image field }, @@ -272,7 +272,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { name: "UpdateSpec", original: containers.Container{ Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -288,7 +288,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { Name: "testruntime", }, Spec: encodedUpdated, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Image: "test image", }, @@ -301,7 +301,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { "bar": "two", }, Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -320,7 +320,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { "bar": "baz", }, Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -336,7 +336,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { "bar": "two", }, Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -349,7 +349,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { fieldpaths: []string{"labels"}, expected: containers.Container{ Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -365,7 +365,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { "bar": "two", }, Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -383,7 +383,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) { "foo": "one", }, Spec: encoded, - RootFS: "test-rootfs", + SnapshotKey: "test-snapshot-key", Snapshotter: "snapshotter", Runtime: containers.RuntimeInfo{ Name: "testruntime", @@ -392,27 +392,27 @@ func TestContainersCreateUpdateDelete(t *testing.T) { }, }, { - name: "UpdateRootFSImmutable", + name: "UpdateSnapshotKeyImmutable", original: containers.Container{ Spec: encoded, - RootFS: "", + SnapshotKey: "", Snapshotter: "", Runtime: containers.RuntimeInfo{ Name: "testruntime", }, }, input: containers.Container{ - RootFS: "something", + SnapshotKey: "something", Snapshotter: "something", }, - fieldpaths: []string{"rootfs", "snapshotter"}, + fieldpaths: []string{"snapshotkey", "snapshotter"}, cause: errdefs.ErrInvalidArgument, }, { - name: "RootFSWithoutSnapshot", + name: "SnapshotKeyWithoutSnapshot", original: containers.Container{ Spec: encoded, - RootFS: "/nosnapshot", + SnapshotKey: "/nosnapshot", Snapshotter: "", Runtime: containers.RuntimeInfo{ Name: "testruntime", diff --git a/services/containers/helpers.go b/services/containers/helpers.go index 0be63e283..d648d1bc4 100644 --- a/services/containers/helpers.go +++ b/services/containers/helpers.go @@ -26,7 +26,7 @@ func containerToProto(container *containers.Container) api.Container { }, Spec: container.Spec, Snapshotter: container.Snapshotter, - RootFS: container.RootFS, + SnapshotKey: container.SnapshotKey, } } @@ -45,6 +45,6 @@ func containerFromProto(containerpb *api.Container) containers.Container { Runtime: runtime, Spec: containerpb.Spec, Snapshotter: containerpb.Snapshotter, - RootFS: containerpb.RootFS, + SnapshotKey: containerpb.SnapshotKey, } } diff --git a/services/containers/service.go b/services/containers/service.go index fb8bc4070..e4a738a68 100644 --- a/services/containers/service.go +++ b/services/containers/service.go @@ -136,10 +136,10 @@ func (s *Service) Update(ctx context.Context, req *api.UpdateContainerRequest) ( } if err := s.publisher.Publish(ctx, "/containers/update", &eventsapi.ContainerUpdate{ - ID: resp.Container.ID, - Image: resp.Container.Image, - Labels: resp.Container.Labels, - RootFS: resp.Container.RootFS, + ID: resp.Container.ID, + Image: resp.Container.Image, + Labels: resp.Container.Labels, + SnapshotKey: resp.Container.SnapshotKey, }); err != nil { return &resp, err } diff --git a/spec_opts_unix.go b/spec_opts_unix.go index 532d38edc..ed2f038f0 100644 --- a/spec_opts_unix.go +++ b/spec_opts_unix.go @@ -251,7 +251,7 @@ func withRemappedSnapshotBase(id string, i Image, uid, gid uint32, readonly bool if _, err := snapshotter.Prepare(ctx, id, usernsID); err != nil { return err } - c.RootFS = id + c.SnapshotKey = id c.Image = i.Name() return nil } @@ -274,7 +274,7 @@ func withRemappedSnapshotBase(id string, i Image, uid, gid uint32, readonly bool if err != nil { return err } - c.RootFS = id + c.SnapshotKey = id c.Image = i.Name() return nil } @@ -319,11 +319,11 @@ func WithUserID(uid uint32) SpecOpts { if c.Snapshotter == "" { return errors.Errorf("no snapshotter set for container") } - if c.RootFS == "" { - return errors.Errorf("rootfs not created for container") + if c.SnapshotKey == "" { + return errors.Errorf("rootfs snapshot not created for container") } snapshotter := client.SnapshotService(c.Snapshotter) - mounts, err := snapshotter.Mounts(ctx, c.RootFS) + mounts, err := snapshotter.Mounts(ctx, c.SnapshotKey) if err != nil { return err } @@ -376,11 +376,11 @@ func WithUsername(username string) SpecOpts { if c.Snapshotter == "" { return errors.Errorf("no snapshotter set for container") } - if c.RootFS == "" { - return errors.Errorf("rootfs not created for container") + if c.SnapshotKey == "" { + return errors.Errorf("rootfs snapshot not created for container") } snapshotter := client.SnapshotService(c.Snapshotter) - mounts, err := snapshotter.Mounts(ctx, c.RootFS) + mounts, err := snapshotter.Mounts(ctx, c.SnapshotKey) if err != nil { return err } diff --git a/task.go b/task.go index 6b35d8742..6da88d374 100644 --- a/task.go +++ b/task.go @@ -415,7 +415,7 @@ func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (d v1 if err := t.checkpointImage(ctx, &index, cr.Image); err != nil { return d, err } - if err := t.checkpointRWSnapshot(ctx, &index, cr.Snapshotter, cr.RootFS); err != nil { + if err := t.checkpointRWSnapshot(ctx, &index, cr.Snapshotter, cr.SnapshotKey); err != nil { return d, err } index.Annotations = make(map[string]string)