JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cache: implement filter for diskusage 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-18.09
Tonis Tiigi 2018-07-25 17:01:37 -07:00
parent d87d9d4c64
commit 0ba24f2a90
5 changed files with 198 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
api/services/control/control.pb.go
View File

@ -57,6 +57,7 @@ var _ = time.Kitchen
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type PruneRequest struct {
Filter []string `protobuf:"bytes,1,rep,name=filter" json:"filter,omitempty"`
}
func (m *PruneRequest) Reset() { *m = PruneRequest{} }
@ -64,8 +65,15 @@ func (m *PruneRequest) String() string { return proto.CompactTextStri
func (*PruneRequest) ProtoMessage() {}
func (*PruneRequest) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{0} }
func (m *PruneRequest) GetFilter() []string {
if m != nil {
return m.Filter
}
return nil
}
type DiskUsageRequest struct {
Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
Filter []string `protobuf:"bytes,1,rep,name=filter" json:"filter,omitempty"`
}
func (m *DiskUsageRequest) Reset() { *m = DiskUsageRequest{} }
@ -73,11 +81,11 @@ func (m *DiskUsageRequest) String() string { return proto.CompactText
func (*DiskUsageRequest) ProtoMessage() {}
func (*DiskUsageRequest) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{1} }
func (m *DiskUsageRequest) GetFilter() string {
func (m *DiskUsageRequest) GetFilter() []string {
if m != nil {
return m.Filter
}
return ""
return nil
}
type DiskUsageResponse struct {
@ -898,6 +906,21 @@ func (m *PruneRequest) MarshalTo(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if len(m.Filter) > 0 {
for _, s := range m.Filter {
dAtA[i] = 0xa
i++
l = len(s)
for l >= 1<<7 {
dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
l >>= 7
i++
}
dAtA[i] = uint8(l)
i++
i += copy(dAtA[i:], s)
}
}
return i, nil
}
@ -917,10 +940,19 @@ func (m *DiskUsageRequest) MarshalTo(dAtA []byte) (int, error) {
var l int
_ = l
if len(m.Filter) > 0 {
dAtA[i] = 0xa
i++
i = encodeVarintControl(dAtA, i, uint64(len(m.Filter)))
i += copy(dAtA[i:], m.Filter)
for _, s := range m.Filter {
dAtA[i] = 0xa
i++
l = len(s)
for l >= 1<<7 {
dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
l >>= 7
i++
}
dAtA[i] = uint8(l)
i++
i += copy(dAtA[i:], s)
}
}
return i, nil
}
@ -1599,15 +1631,23 @@ func encodeVarintControl(dAtA []byte, offset int, v uint64) int {
func (m *PruneRequest) Size() (n int) {
var l int
_ = l
if len(m.Filter) > 0 {
for _, s := range m.Filter {
l = len(s)
n += 1 + l + sovControl(uint64(l))
}
}
return n
}
func (m *DiskUsageRequest) Size() (n int) {
var l int
_ = l
l = len(m.Filter)
if l > 0 {
n += 1 + l + sovControl(uint64(l))
if len(m.Filter) > 0 {
for _, s := range m.Filter {
l = len(s)
n += 1 + l + sovControl(uint64(l))
}
}
return n
}
@ -1940,6 +1980,35 @@ func (m *PruneRequest) Unmarshal(dAtA []byte) error {
return fmt.Errorf("proto: PruneRequest: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Filter", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowControl
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthControl
}
postIndex := iNdEx + intStringLen
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Filter = append(m.Filter, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipControl(dAtA[iNdEx:])
@ -2017,7 +2086,7 @@ func (m *DiskUsageRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Filter = string(dAtA[iNdEx:postIndex])
m.Filter = append(m.Filter, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
default:
iNdEx = preIndex
@ -4511,79 +4580,79 @@ var (
func init() { proto.RegisterFile("control.proto", fileDescriptorControl) }
var fileDescriptorControl = []byte{
// 1176 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4d, 0x6f, 0x23, 0x45,
0x13, 0x7e, 0xc7, 0x76, 0xfc, 0x51, 0x76, 0xa2, 0xbc, 0x0d, 0xac, 0x46, 0x03, 0x24, 0x66, 0x00,
0xc9, 0x5a, 0xed, 0xce, 0x64, 0x03, 0x2b, 0xa1, 0x08, 0xad, 0x76, 0x1d, 0x2f, 0x22, 0x51, 0x22,
0x96, 0xce, 0x86, 0x95, 0xb8, 0x8d, 0xed, 0x8e, 0x77, 0x14, 0x7b, 0x7a, 0xe8, 0xee, 0x09, 0x6b,
0x7e, 0x05, 0x07, 0xfe, 0x09, 0x07, 0xce, 0x1c, 0x90, 0xf6, 0xc8, 0x99, 0x43, 0x16, 0xe5, 0x0e,
0xbf, 0x01, 0xf5, 0xc7, 0xd8, 0xed, 0xd8, 0xf9, 0xdc, 0x53, 0xba, 0x2a, 0x4f, 0x3d, 0x53, 0x5d,
0x4f, 0xb9, 0xab, 0x60, 0xb9, 0x47, 0x13, 0xc1, 0xe8, 0x30, 0x48, 0x19, 0x15, 0x14, 0xad, 0x8e,
0x68, 0x77, 0x1c, 0x74, 0xb3, 0x78, 0xd8, 0x3f, 0x8e, 0x45, 0x70, 0xf2, 0xc0, 0xbb, 0x3f, 0x88,
0xc5, 0xcb, 0xac, 0x1b, 0xf4, 0xe8, 0x28, 0x1c, 0xd0, 0x01, 0x0d, 0x15, 0xb0, 0x9b, 0x1d, 0x29,
0x4b, 0x19, 0xea, 0xa4, 0x09, 0xbc, 0xf5, 0x01, 0xa5, 0x83, 0x21, 0x99, 0xa2, 0x44, 0x3c, 0x22,
0x5c, 0x44, 0xa3, 0xd4, 0x00, 0xee, 0x59, 0x7c, 0xf2, 0x63, 0x61, 0xfe, 0xb1, 0x90, 0xd3, 0xe1,
0x09, 0x61, 0x61, 0xda, 0x0d, 0x69, 0xca, 0x0d, 0x3a, 0xbc, 0x10, 0x1d, 0xa5, 0x71, 0x28, 0xc6,
0x29, 0xe1, 0xe1, 0x8f, 0x94, 0x1d, 0x13, 0xa6, 0x03, 0xfc, 0x15, 0x68, 0x3c, 0x63, 0x59, 0x42,
0x30, 0xf9, 0x21, 0x23, 0x5c, 0xf8, 0x77, 0x61, 0xb5, 0x13, 0xf3, 0xe3, 0x43, 0x1e, 0x0d, 0x72,
0x1f, 0xba, 0x03, 0xe5, 0xa3, 0x78, 0x28, 0x08, 0x73, 0x9d, 0xa6, 0xd3, 0xaa, 0x61, 0x63, 0xf9,
0xbb, 0xf0, 0x7f, 0x0b, 0xcb, 0x53, 0x9a, 0x70, 0x82, 0x1e, 0x42, 0x99, 0x91, 0x1e, 0x65, 0x7d,
0xd7, 0x69, 0x16, 0x5b, 0xf5, 0xcd, 0x0f, 0x83, 0xf3, 0x25, 0x0a, 0x4c, 0x80, 0x04, 0x61, 0x03,
0xf6, 0x7f, 0x2f, 0x40, 0xdd, 0xf2, 0xa3, 0x15, 0x28, 0xec, 0x74, 0xcc, 0xf7, 0x0a, 0x3b, 0x1d,
0xe4, 0x42, 0x65, 0x3f, 0x13, 0x51, 0x77, 0x48, 0xdc, 0x42, 0xd3, 0x69, 0x55, 0x71, 0x6e, 0xa2,
0x77, 0x61, 0x69, 0x27, 0x39, 0xe4, 0xc4, 0x2d, 0x2a, 0xbf, 0x36, 0x10, 0x82, 0xd2, 0x41, 0xfc,
0x13, 0x71, 0x4b, 0x4d, 0xa7, 0x55, 0xc4, 0xea, 0x2c, 0xef, 0xf1, 0x2c, 0x62, 0x24, 0x11, 0xee,
0x92, 0xbe, 0x87, 0xb6, 0x50, 0x1b, 0x6a, 0xdb, 0x8c, 0x44, 0x82, 0xf4, 0x9f, 0x08, 0xb7, 0xdc,
0x74, 0x5a, 0xf5, 0x4d, 0x2f, 0xd0, 0xba, 0x04, 0xb9, 0x2e, 0xc1, 0xf3, 0x5c, 0x97, 0x76, 0xf5,
0xf5, 0xe9, 0xfa, 0xff, 0x7e, 0x7e, 0xb3, 0xee, 0xe0, 0x69, 0x18, 0x7a, 0x0c, 0xb0, 0x17, 0x71,
0x71, 0xc8, 0x15, 0x49, 0xe5, 0x4a, 0x92, 0x92, 0x22, 0xb0, 0x62, 0xd0, 0x1a, 0x80, 0x2a, 0xc0,
0x36, 0xcd, 0x12, 0xe1, 0x56, 0x55, 0xde, 0x96, 0x07, 0x35, 0xa1, 0xde, 0x21, 0xbc, 0xc7, 0xe2,
0x54, 0xc4, 0x34, 0x71, 0x6b, 0xea, 0x0a, 0xb6, 0xcb, 0xff, 0xa5, 0x04, 0x8d, 0x03, 0xd9, 0x14,
0xb9, 0x70, 0xab, 0x50, 0xc4, 0xe4, 0xc8, 0x54, 0x51, 0x1e, 0x51, 0x00, 0xd0, 0x21, 0x47, 0x71,
0x12, 0x2b, 0x8e, 0x82, 0x4a, 0x73, 0x25, 0x48, 0xbb, 0xc1, 0xd4, 0x8b, 0x2d, 0x04, 0xf2, 0xa0,
0xfa, 0xf4, 0x55, 0x4a, 0x99, 0x14, 0xbf, 0xa8, 0x68, 0x26, 0x36, 0x7a, 0x01, 0xcb, 0xf9, 0xf9,
0x89, 0x10, 0x8c, 0xbb, 0x25, 0x25, 0xf8, 0x83, 0x79, 0xc1, 0xed, 0xa4, 0x82, 0x99, 0x98, 0xa7,
0x89, 0x60, 0x63, 0x3c, 0xcb, 0x23, 0xb5, 0x3e, 0x20, 0x9c, 0xcb, 0x0c, 0xb5, 0x50, 0xb9, 0x29,
0xd3, 0xf9, 0x8a, 0xd1, 0x44, 0x90, 0xa4, 0xaf, 0x84, 0xaa, 0xe1, 0x89, 0x2d, 0xd3, 0xc9, 0xcf,
0x3a, 0x9d, 0xca, 0xb5, 0xd2, 0x99, 0x89, 0x31, 0xe9, 0xcc, 0xf8, 0xd0, 0x16, 0x2c, 0x6d, 0x47,
0xbd, 0x97, 0x44, 0x69, 0x52, 0xdf, 0x5c, 0x9b, 0x27, 0x54, 0xff, 0xfe, 0x46, 0x89, 0xc0, 0xdb,
0x25, 0xd9, 0x1e, 0x58, 0x87, 0x78, 0x8f, 0x01, 0xcd, 0xdf, 0x57, 0xea, 0x72, 0x4c, 0xc6, 0xb9,
0x2e, 0xc7, 0x64, 0x2c, 0x9b, 0xf8, 0x24, 0x1a, 0x66, 0xba, 0xb9, 0x6b, 0x58, 0x1b, 0x5b, 0x85,
0x2f, 0x1c, 0xc9, 0x30, 0x9f, 0xe2, 0x4d, 0x18, 0xfc, 0x37, 0x0e, 0x34, 0xec, 0x0c, 0xd1, 0x07,
0x50, 0xd3, 0x49, 0x4d, 0x9b, 0x63, 0xea, 0x90, 0x7d, 0xb8, 0x33, 0x32, 0x06, 0x77, 0x0b, 0xcd,
0x62, 0xab, 0x86, 0x2d, 0x0f, 0xfa, 0x16, 0xea, 0x1a, 0xac, 0xab, 0x5c, 0x54, 0x55, 0x0e, 0x2f,
0x2f, 0x4a, 0x60, 0x45, 0xe8, 0x1a, 0xdb, 0x1c, 0xde, 0x23, 0x58, 0x3d, 0x0f, 0xb8, 0xd1, 0x0d,
0x7f, 0x73, 0x60, 0xd9, 0x88, 0x6a, 0x5e, 0xa1, 0x28, 0x67, 0x24, 0x2c, 0xf7, 0x99, 0xf7, 0xe8,
0xe1, 0x85, 0xfd, 0xa0, 0x61, 0xc1, 0xf9, 0x38, 0x9d, 0xef, 0x1c, 0x9d, 0xb7, 0x0d, 0xef, 0x2d,
0x84, 0xde, 0x28, 0xf3, 0x8f, 0x60, 0xf9, 0x40, 0x44, 0x22, 0xe3, 0x17, 0xfe, 0x64, 0xfd, 0x5f,
0x1d, 0x58, 0xc9, 0x31, 0xe6, 0x76, 0x9f, 0x43, 0xf5, 0x84, 0x30, 0x41, 0x5e, 0x11, 0x6e, 0x6e,
0xe5, 0xce, 0xdf, 0xea, 0x3b, 0x85, 0xc0, 0x13, 0x24, 0xda, 0x82, 0x2a, 0x57, 0x3c, 0x44, 0xcb,
0xba, 0xb0, 0x95, 0x75, 0x94, 0xf9, 0xde, 0x04, 0x8f, 0x42, 0x28, 0x0d, 0xe9, 0x20, 0x57, 0xfb,
0xfd, 0x8b, 0xe2, 0xf6, 0xe8, 0x00, 0x2b, 0xa0, 0x7f, 0x5a, 0x80, 0xb2, 0xf6, 0xa1, 0x5d, 0x28,
0xf7, 0xe3, 0x01, 0xe1, 0x42, 0xdf, 0xaa, 0xbd, 0x29, 0x7f, 0x20, 0x7f, 0x9d, 0xae, 0xdf, 0xb5,
0x66, 0x15, 0x4d, 0x49, 0x22, 0x27, 0x6b, 0x14, 0x27, 0x84, 0xf1, 0x70, 0x40, 0xef, 0xeb, 0x90,
0xa0, 0xa3, 0xfe, 0x60, 0xc3, 0x20, 0xb9, 0xe2, 0x24, 0xcd, 0x84, 0x69, 0xcc, 0xdb, 0x71, 0x69,
0x06, 0x39, 0x22, 0x92, 0x68, 0x44, 0xcc, 0xbb, 0xa6, 0xce, 0x72, 0x44, 0xf4, 0x64, 0xdf, 0xf6,
0xd5, 0xe0, 0xa8, 0x62, 0x63, 0xa1, 0x2d, 0xa8, 0x70, 0x11, 0x31, 0x41, 0xfa, 0xea, 0x49, 0xba,
0xce, 0xdb, 0x9e, 0x07, 0xa0, 0x47, 0x50, 0xeb, 0xd1, 0x51, 0x3a, 0x24, 0x32, 0xba, 0x7c, 0xcd,
0xe8, 0x69, 0x88, 0xec, 0x1e, 0xc2, 0x18, 0x65, 0x6a, 0xaa, 0xd4, 0xb0, 0x36, 0xfc, 0x7f, 0x0b,
0xd0, 0xb0, 0xc5, 0x9a, 0x9b, 0x98, 0xbb, 0x50, 0xd6, 0xd2, 0xeb, 0xae, 0xbb, 0x5d, 0xa9, 0x34,
0xc3, 0xc2, 0x52, 0xb9, 0x50, 0xe9, 0x65, 0x4c, 0x8d, 0x53, 0x3d, 0x64, 0x73, 0x53, 0x26, 0x2c,
0xa8, 0x88, 0x86, 0xaa, 0x54, 0x45, 0xac, 0x0d, 0x39, 0x65, 0x27, 0xbb, 0xcd, 0xcd, 0xa6, 0xec,
0x24, 0xcc, 0x96, 0xa1, 0xf2, 0x56, 0x32, 0x54, 0x6f, 0x2c, 0x83, 0xff, 0x87, 0x03, 0xb5, 0x49,
0x97, 0x5b, 0xd5, 0x75, 0xde, 0xba, 0xba, 0x33, 0x95, 0x29, 0xdc, 0xae, 0x32, 0x77, 0xa0, 0xcc,
0x05, 0x23, 0xd1, 0x48, 0x69, 0x54, 0xc4, 0xc6, 0x92, 0xef, 0xc9, 0x88, 0x0f, 0x94, 0x42, 0x0d,
0x2c, 0x8f, 0xbe, 0x0f, 0x8d, 0xf6, 0x58, 0x10, 0xbe, 0x4f, 0xb8, 0x5c, 0x2e, 0xa4, 0xb6, 0xfd,
0x48, 0x44, 0xea, 0x1e, 0x0d, 0xac, 0xce, 0xfe, 0x3d, 0x40, 0x7b, 0x31, 0x17, 0x2f, 0xd4, 0xa6,
0xc8, 0x17, 0xed, 0x81, 0x45, 0x6b, 0x0f, 0x3c, 0x80, 0x77, 0x66, 0xd0, 0xe6, 0x95, 0xfa, 0xf2,
0xdc, 0x26, 0xf8, 0xc9, 0xfc, 0xab, 0xa1, 0x16, 0xd2, 0x40, 0x07, 0xce, 0x2e, 0x84, 0x9b, 0xff,
0x14, 0xa1, 0xb2, 0xad, 0x77, 0x6d, 0xf4, 0x1c, 0x6a, 0x93, 0x45, 0x13, 0xf9, 0xf3, 0x34, 0xe7,
0x37, 0x56, 0xef, 0xe3, 0x4b, 0x31, 0x26, 0xbf, 0xaf, 0x61, 0x49, 0xad, 0xbe, 0x68, 0xc1, 0x33,
0x68, 0xef, 0xc4, 0xde, 0xe5, 0x2b, 0xec, 0x86, 0x23, 0x99, 0xd4, 0x0c, 0x59, 0xc4, 0x64, 0x2f,
0x1b, 0xde, 0xfa, 0x15, 0xc3, 0x07, 0xed, 0x43, 0xd9, 0xfc, 0x9c, 0x17, 0x41, 0xed, 0x49, 0xe1,
0x35, 0x2f, 0x06, 0x68, 0xb2, 0x0d, 0x07, 0xed, 0x4f, 0x36, 0xa9, 0x45, 0xa9, 0xd9, 0x6d, 0xe0,
0x5d, 0xf1, 0xff, 0x96, 0xb3, 0xe1, 0xa0, 0xef, 0xa1, 0x6e, 0x09, 0x8d, 0x16, 0x08, 0x3a, 0xdf,
0x35, 0xde, 0xa7, 0x57, 0xa0, 0x74, 0xb2, 0xed, 0xc6, 0xeb, 0xb3, 0x35, 0xe7, 0xcf, 0xb3, 0x35,
0xe7, 0xef, 0xb3, 0x35, 0xa7, 0x5b, 0x56, 0x7d, 0xff, 0xd9, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff,
0xe1, 0xef, 0xcc, 0xf5, 0x6f, 0x0d, 0x00, 0x00,
// 1171 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
0x14, 0x67, 0x6d, 0xc7, 0xf6, 0x3e, 0x3b, 0x55, 0x18, 0xa0, 0x5a, 0x2d, 0x90, 0x98, 0xe5, 0x8f,
0xac, 0xaa, 0xdd, 0x6d, 0x03, 0x95, 0x50, 0x84, 0xaa, 0xd6, 0x71, 0x11, 0xa9, 0x12, 0x51, 0x26,
0x0d, 0x95, 0xb8, 0xad, 0xed, 0xc9, 0x76, 0x15, 0x7b, 0x67, 0x99, 0x99, 0x0d, 0x35, 0x9f, 0x82,
0x03, 0xdf, 0x84, 0x03, 0x67, 0x0e, 0x48, 0x3d, 0x72, 0xe6, 0x90, 0xa2, 0xdc, 0xe1, 0x33, 0xa0,
0xf9, 0xb3, 0xf6, 0x3a, 0x76, 0xe2, 0x24, 0x3d, 0x65, 0xde, 0xcb, 0xef, 0xfd, 0xfc, 0xe6, 0xfd,
0xde, 0xce, 0x7b, 0xb0, 0xda, 0xa7, 0x89, 0x60, 0x74, 0xe8, 0xa7, 0x8c, 0x0a, 0x8a, 0xd6, 0x46,
0xb4, 0x37, 0xf6, 0x7b, 0x59, 0x3c, 0x1c, 0x1c, 0xc5, 0xc2, 0x3f, 0xbe, 0xe7, 0xde, 0x89, 0x62,
0xf1, 0x22, 0xeb, 0xf9, 0x7d, 0x3a, 0x0a, 0x22, 0x1a, 0xd1, 0x40, 0x01, 0x7b, 0xd9, 0xa1, 0xb2,
0x94, 0xa1, 0x4e, 0x9a, 0xc0, 0xdd, 0x88, 0x28, 0x8d, 0x86, 0x64, 0x8a, 0x12, 0xf1, 0x88, 0x70,
0x11, 0x8e, 0x52, 0x03, 0xb8, 0x5d, 0xe0, 0x93, 0x3f, 0x16, 0xe4, 0x3f, 0x16, 0x70, 0x3a, 0x3c,
0x26, 0x2c, 0x48, 0x7b, 0x01, 0x4d, 0xb9, 0x41, 0x07, 0xe7, 0xa2, 0xc3, 0x34, 0x0e, 0xc4, 0x38,
0x25, 0x3c, 0xf8, 0x89, 0xb2, 0x23, 0xc2, 0x74, 0x80, 0xf7, 0x19, 0x34, 0x9f, 0xb2, 0x2c, 0x21,
0x98, 0xfc, 0x98, 0x11, 0x2e, 0xd0, 0x4d, 0xa8, 0x1e, 0xc6, 0x43, 0x41, 0x98, 0x63, 0xb5, 0xca,
0x6d, 0x1b, 0x1b, 0xcb, 0xbb, 0x05, 0x6b, 0xdd, 0x98, 0x1f, 0x1d, 0xf0, 0x30, 0x5a, 0x8a, 0x7d,
0x02, 0x6f, 0x17, 0xb0, 0x3c, 0xa5, 0x09, 0x27, 0xe8, 0x3e, 0x54, 0x19, 0xe9, 0x53, 0x36, 0x50,
0xe0, 0xc6, 0xe6, 0x87, 0xfe, 0xd9, 0xd2, 0xf9, 0x26, 0x40, 0x82, 0xb0, 0x01, 0x7b, 0x7f, 0x94,
0xa0, 0x51, 0xf0, 0xa3, 0x1b, 0x50, 0xda, 0xe9, 0x3a, 0x56, 0xcb, 0x6a, 0xdb, 0xb8, 0xb4, 0xd3,
0x45, 0x0e, 0xd4, 0xf6, 0x32, 0x11, 0xf6, 0x86, 0xc4, 0x29, 0xb5, 0xac, 0x76, 0x1d, 0xe7, 0x26,
0x7a, 0x17, 0x56, 0x76, 0x92, 0x03, 0x4e, 0x9c, 0xb2, 0xf2, 0x6b, 0x03, 0x21, 0xa8, 0xec, 0xc7,
0x3f, 0x13, 0xa7, 0xd2, 0xb2, 0xda, 0x65, 0xac, 0xce, 0xf2, 0x1e, 0x4f, 0x43, 0x46, 0x12, 0xe1,
0xac, 0x28, 0x5e, 0x63, 0xa1, 0x0e, 0xd8, 0xdb, 0x8c, 0x84, 0x82, 0x0c, 0x1e, 0x09, 0xa7, 0xda,
0xb2, 0xda, 0x8d, 0x4d, 0xd7, 0xd7, 0x7a, 0xf9, 0xb9, 0x5e, 0xfe, 0xb3, 0x5c, 0xaf, 0x4e, 0xfd,
0xd5, 0xc9, 0xc6, 0x5b, 0xbf, 0xbc, 0xde, 0xb0, 0xf0, 0x34, 0x0c, 0x3d, 0x04, 0xd8, 0x0d, 0xb9,
0x38, 0xe0, 0x8a, 0xa4, 0xb6, 0x94, 0xa4, 0xa2, 0x08, 0x0a, 0x31, 0x68, 0x1d, 0x40, 0x15, 0x60,
0x9b, 0x66, 0x89, 0x70, 0xea, 0x2a, 0xef, 0x82, 0x07, 0xb5, 0xa0, 0xd1, 0x25, 0xbc, 0xcf, 0xe2,
0x54, 0xc4, 0x34, 0x71, 0x6c, 0x75, 0x85, 0xa2, 0xcb, 0xfb, 0xb5, 0x02, 0xcd, 0x7d, 0xd9, 0x2c,
0xb9, 0x70, 0x6b, 0x50, 0xc6, 0xe4, 0xd0, 0x54, 0x51, 0x1e, 0x91, 0x0f, 0xd0, 0x25, 0x87, 0x71,
0x12, 0x2b, 0x8e, 0x92, 0x4a, 0xf3, 0x86, 0x9f, 0xf6, 0xfc, 0xa9, 0x17, 0x17, 0x10, 0xc8, 0x85,
0xfa, 0xe3, 0x97, 0x29, 0x65, 0x52, 0xfc, 0xb2, 0xa2, 0x99, 0xd8, 0xe8, 0x39, 0xac, 0xe6, 0xe7,
0x47, 0x42, 0x30, 0xee, 0x54, 0x94, 0xe0, 0xf7, 0xe6, 0x05, 0x2f, 0x26, 0xe5, 0xcf, 0xc4, 0x3c,
0x4e, 0x04, 0x1b, 0xe3, 0x59, 0x1e, 0xa9, 0xf5, 0x3e, 0xe1, 0x5c, 0x66, 0xa8, 0x85, 0xca, 0x4d,
0x99, 0xce, 0xd7, 0x8c, 0x26, 0x82, 0x24, 0x03, 0x25, 0x94, 0x8d, 0x27, 0xb6, 0x4c, 0x27, 0x3f,
0xeb, 0x74, 0x6a, 0x97, 0x4a, 0x67, 0x26, 0xc6, 0xa4, 0x33, 0xe3, 0x43, 0x5b, 0xb0, 0xb2, 0x1d,
0xf6, 0x5f, 0x10, 0xa5, 0x49, 0x63, 0x73, 0x7d, 0x9e, 0x50, 0xfd, 0xfb, 0x5b, 0x25, 0x02, 0xef,
0x54, 0x64, 0x7b, 0x60, 0x1d, 0xe2, 0x3e, 0x04, 0x34, 0x7f, 0x5f, 0xa9, 0xcb, 0x11, 0x19, 0xe7,
0xba, 0x1c, 0x91, 0xb1, 0x6c, 0xe2, 0xe3, 0x70, 0x98, 0xe9, 0xe6, 0xb6, 0xb1, 0x36, 0xb6, 0x4a,
0x5f, 0x5a, 0x92, 0x61, 0x3e, 0xc5, 0xab, 0x30, 0x78, 0xaf, 0x2d, 0x68, 0x16, 0x33, 0x44, 0x1f,
0x80, 0xad, 0x93, 0x9a, 0x36, 0xc7, 0xd4, 0x21, 0xfb, 0x70, 0x67, 0x64, 0x0c, 0xee, 0x94, 0xd4,
0x17, 0x5f, 0xf0, 0xa0, 0xef, 0xa0, 0xa1, 0xc1, 0xba, 0xca, 0x65, 0x55, 0xe5, 0xe0, 0xe2, 0xa2,
0xf8, 0x85, 0x08, 0x5d, 0xe3, 0x22, 0x87, 0xfb, 0x00, 0xd6, 0xce, 0x02, 0xae, 0x74, 0xc3, 0xdf,
0x2d, 0x58, 0x35, 0xa2, 0x9a, 0x57, 0x28, 0xcc, 0x19, 0x09, 0xcb, 0x7d, 0xe6, 0x3d, 0xba, 0x7f,
0x6e, 0x3f, 0x68, 0x98, 0x7f, 0x36, 0x4e, 0xe7, 0x3b, 0x47, 0xe7, 0x6e, 0xc3, 0x7b, 0x0b, 0xa1,
0x57, 0xca, 0xfc, 0x23, 0x58, 0xdd, 0x17, 0xa1, 0xc8, 0xf8, 0xb9, 0x9f, 0xac, 0xf7, 0x9b, 0x05,
0x37, 0x72, 0x8c, 0xb9, 0xdd, 0x17, 0x50, 0x3f, 0x26, 0x4c, 0x90, 0x97, 0x84, 0x9b, 0x5b, 0x39,
0xf3, 0xb7, 0xfa, 0x5e, 0x21, 0xf0, 0x04, 0x89, 0xb6, 0xa0, 0xce, 0x15, 0x0f, 0xd1, 0xb2, 0x2e,
0x6c, 0x65, 0x1d, 0x65, 0x7e, 0x6f, 0x82, 0x47, 0x01, 0x54, 0x86, 0x34, 0xca, 0xd5, 0x7e, 0xff,
0xbc, 0xb8, 0x5d, 0x1a, 0x61, 0x05, 0xf4, 0x4e, 0x4a, 0x50, 0xd5, 0x3e, 0xf4, 0x04, 0xaa, 0x83,
0x38, 0x22, 0x5c, 0xe8, 0x5b, 0x75, 0x36, 0xe5, 0x07, 0xf2, 0xf7, 0xc9, 0xc6, 0xad, 0xc2, 0x0c,
0xa3, 0x29, 0x49, 0xe4, 0xc4, 0x0d, 0xe3, 0x84, 0x30, 0x1e, 0x44, 0xf4, 0x8e, 0x0e, 0xf1, 0xbb,
0xea, 0x0f, 0x36, 0x0c, 0x92, 0x2b, 0x4e, 0xd2, 0x4c, 0x98, 0xc6, 0xbc, 0x1e, 0x97, 0x66, 0x90,
0x23, 0x22, 0x09, 0x47, 0xc4, 0xbc, 0x6b, 0xea, 0x2c, 0x47, 0x44, 0x5f, 0xf6, 0xed, 0x40, 0x0d,
0x8e, 0x3a, 0x36, 0x16, 0xda, 0x82, 0x1a, 0x17, 0x21, 0x13, 0x64, 0xa0, 0x9e, 0xa4, 0xcb, 0xbc,
0xed, 0x79, 0x00, 0x7a, 0x00, 0x76, 0x9f, 0x8e, 0xd2, 0x21, 0x91, 0xd1, 0xd5, 0x4b, 0x46, 0x4f,
0x43, 0x64, 0xf7, 0x10, 0xc6, 0x28, 0x53, 0x53, 0xc5, 0xc6, 0xda, 0xf0, 0xfe, 0x2b, 0x41, 0xb3,
0x28, 0xd6, 0xdc, 0xc4, 0x7c, 0x02, 0x55, 0x2d, 0xbd, 0xee, 0xba, 0xeb, 0x95, 0x4a, 0x33, 0x2c,
0x2c, 0x95, 0x03, 0xb5, 0x7e, 0xc6, 0xd4, 0x38, 0xd5, 0x43, 0x36, 0x37, 0x65, 0xc2, 0x82, 0x8a,
0x70, 0xa8, 0x4a, 0x55, 0xc6, 0xda, 0x90, 0x53, 0x76, 0xb2, 0xf3, 0x5c, 0x6d, 0xca, 0x4e, 0xc2,
0x8a, 0x32, 0xd4, 0xde, 0x48, 0x86, 0xfa, 0x95, 0x65, 0xf0, 0xfe, 0xb4, 0xc0, 0x9e, 0x74, 0x79,
0xa1, 0xba, 0xd6, 0x1b, 0x57, 0x77, 0xa6, 0x32, 0xa5, 0xeb, 0x55, 0xe6, 0x26, 0x54, 0xb9, 0x60,
0x24, 0x1c, 0x29, 0x8d, 0xca, 0xd8, 0x58, 0xf2, 0x3d, 0x19, 0xf1, 0x48, 0x29, 0xd4, 0xc4, 0xf2,
0xe8, 0x79, 0xd0, 0xec, 0x8c, 0x05, 0xe1, 0x7b, 0x84, 0xcb, 0xe5, 0x42, 0x6a, 0x3b, 0x08, 0x45,
0xa8, 0xee, 0xd1, 0xc4, 0xea, 0xec, 0xdd, 0x06, 0xb4, 0x1b, 0x73, 0xf1, 0x5c, 0x6d, 0x90, 0x7c,
0xd9, 0x1e, 0xb8, 0x0f, 0xef, 0xcc, 0xa0, 0xcd, 0x2b, 0xf5, 0xd5, 0x99, 0x4d, 0xf0, 0x93, 0xf9,
0x57, 0x43, 0x2d, 0xaa, 0xbe, 0x0e, 0x9c, 0x5d, 0x08, 0x37, 0xff, 0x2d, 0x43, 0x6d, 0x5b, 0xef,
0xe0, 0xe8, 0x19, 0xd8, 0x93, 0x45, 0x13, 0x79, 0xf3, 0x34, 0x67, 0x37, 0x56, 0xf7, 0xe3, 0x0b,
0x31, 0x26, 0xbf, 0x6f, 0x60, 0x45, 0xad, 0xc4, 0x68, 0xc1, 0x33, 0x58, 0xdc, 0x95, 0xdd, 0x8b,
0x57, 0xd8, 0xbb, 0x96, 0x64, 0x52, 0x33, 0x64, 0x11, 0x53, 0x71, 0xd9, 0x70, 0x37, 0x96, 0x0c,
0x1f, 0xb4, 0x07, 0x55, 0xf3, 0x39, 0x2f, 0x82, 0x16, 0x27, 0x85, 0xdb, 0x3a, 0x1f, 0xa0, 0xc9,
0xee, 0x5a, 0x68, 0x6f, 0xb2, 0x49, 0x2d, 0x4a, 0xad, 0xd8, 0x06, 0xee, 0x92, 0xff, 0xb7, 0xad,
0xbb, 0x16, 0xfa, 0x01, 0x1a, 0x05, 0xa1, 0xd1, 0x02, 0x41, 0xe7, 0xbb, 0xc6, 0xfd, 0x74, 0x09,
0x4a, 0x27, 0xdb, 0x69, 0xbe, 0x3a, 0x5d, 0xb7, 0xfe, 0x3a, 0x5d, 0xb7, 0xfe, 0x39, 0x5d, 0xb7,
0x7a, 0x55, 0xd5, 0xf7, 0x9f, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x32, 0x58, 0x96, 0x9a, 0x87,
0x0d, 0x00, 0x00,
}

4
api/services/control/control.proto
View File

@ -25,11 +25,11 @@ service Control {
}
message PruneRequest {
// TODO: filter
repeated string filter = 1; // FIXME: not implemented
}
message DiskUsageRequest {
string filter = 1; // FIXME: this should be containerd-compatible repeated string?
repeated string filter = 1;
}
message DiskUsageResponse {

42
cache/manager.go vendored
View File

@ -2,10 +2,10 @@ package cache
import (
"context"
"strings"
"sync"
"time"
"github.com/containerd/containerd/filters"
"github.com/containerd/containerd/snapshots"
"github.com/moby/buildkit/cache/metadata"
"github.com/moby/buildkit/client"
@ -398,6 +398,11 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo) err
}
func (cm *cacheManager) DiskUsage(ctx context.Context, opt client.DiskUsageInfo) ([]*client.UsageInfo, error) {
filter, err := filters.ParseAll(opt.Filter...)
if err != nil {
return nil, err
}
cm.mu.Lock()
type cacheUsageInfo struct {
@ -465,10 +470,6 @@ func (cm *cacheManager) DiskUsage(ctx context.Context, opt client.DiskUsageInfo)
var du []*client.UsageInfo
for id, cr := range m {
if opt.Filter != "" && !strings.HasPrefix(id, opt.Filter) {
continue
}
c := &client.UsageInfo{
ID: id,
Mutable: cr.mutable,
@ -480,7 +481,9 @@ func (cm *cacheManager) DiskUsage(ctx context.Context, opt client.DiskUsageInfo)
LastUsedAt: cr.lastUsedAt,
UsageCount: cr.usageCount,
}
du = append(du, c)
if filter.Match(adaptUsageInfo(c)) {
du = append(du, c)
}
}
eg, ctx := errgroup.WithContext(ctx)
@ -571,3 +574,30 @@ func initializeMetadata(m withMetadata, opts ...RefOption) error {
return md.Commit()
}
func adaptUsageInfo(info *client.UsageInfo) filters.Adaptor {
return filters.AdapterFunc(func(fieldpath []string) (string, bool) {
if len(fieldpath) == 0 {
return "", false
}
switch fieldpath[0] {
case "id":
return info.ID, info.ID != ""
case "parent":
return info.Parent, info.Parent != ""
case "description":
return info.Description, info.Description != ""
case "inuse":
return "", info.InUse
case "mutable":
return "", info.Mutable
case "immutable":
return "", !info.Mutable
}
// TODO: add int/datetime/bytes support for more fields
return "", false
})
}

4
client/diskusage.go
View File

@ -63,10 +63,10 @@ func (c *Client) DiskUsage(ctx context.Context, opts ...DiskUsageOption) ([]*Usa
type DiskUsageOption func(*DiskUsageInfo)
type DiskUsageInfo struct {
Filter string
Filter []string
}
func WithFilter(f string) DiskUsageOption {
func WithFilter(f []string) DiskUsageOption {
return func(di *DiskUsageInfo) {
di.Filter = f
}

6
cmd/buildctl/diskusage.go
View File

@ -16,9 +16,9 @@ var diskUsageCommand = cli.Command{
Usage: "disk usage",
Action: diskUsage,
Flags: []cli.Flag{
cli.StringFlag{
cli.StringSliceFlag{
Name: "filter, f",
Usage: "Filter snapshot ID",
Usage: "Filter records",
},
cli.BoolFlag{
Name: "verbose, v",
@ -33,7 +33,7 @@ func diskUsage(clicontext *cli.Context) error {
return err
}
du, err := c.DiskUsage(commandContext(clicontext), client.WithFilter(clicontext.String("filter")))
du, err := c.DiskUsage(commandContext(clicontext), client.WithFilter(clicontext.StringSlice("filter")))
if err != nil {
return err
}