layer: remove unused error return from .Size() and .DiffSize()
None of the implementations used return an error, so removing the error return can simplify using these. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
eddbd6ff1e
commit
e1ea911aba
|
@ -405,11 +405,7 @@ func (s *snapshotter) Usage(ctx context.Context, key string) (us snapshots.Usage
|
||||||
if l, err := s.getLayer(key, true); err != nil {
|
if l, err := s.getLayer(key, true); err != nil {
|
||||||
return usage, err
|
return usage, err
|
||||||
} else if l != nil {
|
} else if l != nil {
|
||||||
s, err := l.DiffSize()
|
usage.Size = l.DiffSize()
|
||||||
if err != nil {
|
|
||||||
return usage, err
|
|
||||||
}
|
|
||||||
usage.Size = s
|
|
||||||
return usage, nil
|
return usage, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,12 +40,8 @@ func (i *ImageService) ImageHistory(name string) ([]*image.HistoryResponseItem,
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
layerSize, err = l.DiffSize()
|
layerSize = l.DiffSize()
|
||||||
layer.ReleaseAndLog(i.layerStore, l)
|
layer.ReleaseAndLog(i.layerStore, l)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
layerCounter++
|
layerCounter++
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,11 +42,7 @@ func (i *ImageService) LookupImage(name string) (*types.ImageInspect, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer layer.ReleaseAndLog(i.layerStore, l)
|
defer layer.ReleaseAndLog(i.layerStore, l)
|
||||||
size, err = l.Size()
|
size = l.Size()
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
layerMetadata, err = l.Metadata()
|
layerMetadata, err = l.Metadata()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -143,12 +143,7 @@ deleteImagesLoop:
|
||||||
if d.Deleted != "" {
|
if d.Deleted != "" {
|
||||||
chid := layer.ChainID(d.Deleted)
|
chid := layer.ChainID(d.Deleted)
|
||||||
if l, ok := allLayers[chid]; ok {
|
if l, ok := allLayers[chid]; ok {
|
||||||
diffSize, err := l.DiffSize()
|
rep.SpaceReclaimed += uint64(l.DiffSize())
|
||||||
if err != nil {
|
|
||||||
logrus.Warnf("failed to get layer %s size: %v", chid, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
rep.SpaceReclaimed += uint64(diffSize)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,10 +33,8 @@ func (i *ImageService) GetContainerLayerSize(containerID string) (int64, int64)
|
||||||
}
|
}
|
||||||
|
|
||||||
if parent := rwlayer.Parent(); parent != nil {
|
if parent := rwlayer.Parent(); parent != nil {
|
||||||
sizeRootfs, err = parent.Size()
|
sizeRootfs = parent.Size()
|
||||||
if err != nil {
|
if sizeRw != -1 {
|
||||||
sizeRootfs = -1
|
|
||||||
} else if sizeRw != -1 {
|
|
||||||
sizeRootfs += sizeRw
|
sizeRootfs += sizeRw
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,11 +128,8 @@ func (i *ImageService) Images(_ context.Context, opts types.ImageListOptions) ([
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
size, err = l.Size()
|
size = l.Size()
|
||||||
layer.ReleaseAndLog(i.layerStore, l)
|
layer.ReleaseAndLog(i.layerStore, l)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
summary := newImageSummary(img, size)
|
summary := newImageSummary(img, size)
|
||||||
|
@ -244,11 +241,7 @@ func (i *ImageService) Images(_ context.Context, opts types.ImageListOptions) ([
|
||||||
if _, ok := allLayers[chid]; !ok {
|
if _, ok := allLayers[chid]; !ok {
|
||||||
return nil, fmt.Errorf("layer %v was not found (corruption?)", chid)
|
return nil, fmt.Errorf("layer %v was not found (corruption?)", chid)
|
||||||
}
|
}
|
||||||
diffSize, err := allLayers[chid].DiffSize()
|
summary.SharedSize += allLayers[chid].DiffSize()
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
summary.SharedSize += diffSize
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -209,13 +209,9 @@ func (i *ImageService) LayerDiskUsage(ctx context.Context) (int64, error) {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
return allLayersSize, ctx.Err()
|
return allLayersSize, ctx.Err()
|
||||||
default:
|
default:
|
||||||
size, err := l.DiffSize()
|
size := l.DiffSize()
|
||||||
if err == nil {
|
if _, ok := layerRefs[l.ChainID()]; ok {
|
||||||
if _, ok := layerRefs[l.ChainID()]; ok {
|
allLayersSize += size
|
||||||
allLayersSize += size
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
logrus.Warnf("failed to get diff size for layer %v", l.ChainID())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -230,7 +230,7 @@ func (l *storeLayer) Open() (io.ReadCloser, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *storeLayer) Size() (int64, error) {
|
func (l *storeLayer) Size() (int64, error) {
|
||||||
return l.Layer.DiffSize()
|
return l.Layer.DiffSize(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *storeLayer) MediaType() string {
|
func (l *storeLayer) MediaType() string {
|
||||||
|
|
|
@ -48,12 +48,12 @@ func (ml *mockLayer) Parent() layer.Layer {
|
||||||
return ml.parent
|
return ml.parent
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ml *mockLayer) Size() (size int64, err error) {
|
func (ml *mockLayer) Size() int64 {
|
||||||
return 0, nil
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ml *mockLayer) DiffSize() (size int64, err error) {
|
func (ml *mockLayer) DiffSize() int64 {
|
||||||
return 0, nil
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ml *mockLayer) Metadata() (map[string]string, error) {
|
func (ml *mockLayer) Metadata() (map[string]string, error) {
|
||||||
|
|
|
@ -42,12 +42,12 @@ func (el *emptyLayer) Parent() Layer {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (el *emptyLayer) Size() (size int64, err error) {
|
func (el *emptyLayer) Size() int64 {
|
||||||
return 0, nil
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func (el *emptyLayer) DiffSize() (size int64, err error) {
|
func (el *emptyLayer) DiffSize() int64 {
|
||||||
return 0, nil
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func (el *emptyLayer) Metadata() (map[string]string, error) {
|
func (el *emptyLayer) Metadata() (map[string]string, error) {
|
||||||
|
|
|
@ -20,11 +20,11 @@ func TestEmptyLayer(t *testing.T) {
|
||||||
t.Fatal("expected no parent for empty layer")
|
t.Fatal("expected no parent for empty layer")
|
||||||
}
|
}
|
||||||
|
|
||||||
if size, err := EmptyLayer.Size(); err != nil || size != 0 {
|
if size := EmptyLayer.Size(); size != 0 {
|
||||||
t.Fatal("expected zero size for empty layer")
|
t.Fatal("expected zero size for empty layer")
|
||||||
}
|
}
|
||||||
|
|
||||||
if diffSize, err := EmptyLayer.DiffSize(); err != nil || diffSize != 0 {
|
if diffSize := EmptyLayer.DiffSize(); diffSize != 0 {
|
||||||
t.Fatal("expected zero diffsize for empty layer")
|
t.Fatal("expected zero diffsize for empty layer")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -102,11 +102,11 @@ type Layer interface {
|
||||||
|
|
||||||
// Size returns the size of the entire layer chain. The size
|
// Size returns the size of the entire layer chain. The size
|
||||||
// is calculated from the total size of all files in the layers.
|
// is calculated from the total size of all files in the layers.
|
||||||
Size() (int64, error)
|
Size() int64
|
||||||
|
|
||||||
// DiffSize returns the size difference of the top layer
|
// DiffSize returns the size difference of the top layer
|
||||||
// from parent layer.
|
// from parent layer.
|
||||||
DiffSize() (int64, error)
|
DiffSize() int64
|
||||||
|
|
||||||
// Metadata returns the low level storage metadata associated
|
// Metadata returns the low level storage metadata associated
|
||||||
// with layer.
|
// with layer.
|
||||||
|
|
|
@ -439,7 +439,7 @@ func (ls *layerStore) deleteLayer(layer *roLayer, metadata *Metadata) error {
|
||||||
}
|
}
|
||||||
metadata.DiffID = layer.diffID
|
metadata.DiffID = layer.diffID
|
||||||
metadata.ChainID = layer.chainID
|
metadata.ChainID = layer.chainID
|
||||||
metadata.Size, err = layer.Size()
|
metadata.Size = layer.Size()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -173,14 +173,9 @@ func getCachedLayer(l Layer) *roLayer {
|
||||||
func createMetadata(layers ...Layer) []Metadata {
|
func createMetadata(layers ...Layer) []Metadata {
|
||||||
metadata := make([]Metadata, len(layers))
|
metadata := make([]Metadata, len(layers))
|
||||||
for i := range layers {
|
for i := range layers {
|
||||||
size, err := layers[i].Size()
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
metadata[i].ChainID = layers[i].ChainID()
|
metadata[i].ChainID = layers[i].ChainID()
|
||||||
metadata[i].DiffID = layers[i].DiffID()
|
metadata[i].DiffID = layers[i].DiffID()
|
||||||
metadata[i].Size = size
|
metadata[i].Size = layers[i].Size()
|
||||||
metadata[i].DiffSize = getCachedLayer(layers[i]).size
|
metadata[i].DiffSize = getCachedLayer(layers[i]).size
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -229,15 +224,8 @@ func assertLayerEqual(t *testing.T, l1, l2 Layer) {
|
||||||
t.Fatalf("Mismatched DiffID: %s vs %s", l1.DiffID(), l2.DiffID())
|
t.Fatalf("Mismatched DiffID: %s vs %s", l1.DiffID(), l2.DiffID())
|
||||||
}
|
}
|
||||||
|
|
||||||
size1, err := l1.Size()
|
size1 := l1.Size()
|
||||||
if err != nil {
|
size2 := l2.Size()
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
size2, err := l2.Size()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if size1 != size2 {
|
if size1 != size2 {
|
||||||
t.Fatalf("Mismatched size: %d vs %d", size1, size2)
|
t.Fatalf("Mismatched size: %d vs %d", size1, size2)
|
||||||
|
@ -266,7 +254,7 @@ func TestMountAndRegister(t *testing.T) {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
size, _ := layer.Size()
|
size := layer.Size()
|
||||||
t.Logf("Layer size: %d", size)
|
t.Logf("Layer size: %d", size)
|
||||||
|
|
||||||
mount2, err := ls.CreateRWLayer("new-test-mount", layer.ChainID(), nil)
|
mount2, err := ls.CreateRWLayer("new-test-mount", layer.ChainID(), nil)
|
||||||
|
|
|
@ -44,11 +44,7 @@ func TestLayerSize(t *testing.T) {
|
||||||
t.Fatalf("Unexpected diff size %d, expected %d", layer1DiffSize, len(content1))
|
t.Fatalf("Unexpected diff size %d, expected %d", layer1DiffSize, len(content1))
|
||||||
}
|
}
|
||||||
|
|
||||||
layer1Size, err := layer1.Size()
|
layer1Size := layer1.Size()
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if expected := len(content1); int(layer1Size) != expected {
|
if expected := len(content1); int(layer1Size) != expected {
|
||||||
t.Fatalf("Unexpected size %d, expected %d", layer1Size, expected)
|
t.Fatalf("Unexpected size %d, expected %d", layer1Size, expected)
|
||||||
}
|
}
|
||||||
|
@ -62,10 +58,7 @@ func TestLayerSize(t *testing.T) {
|
||||||
t.Fatalf("Unexpected diff size %d, expected %d", layer2DiffSize, len(content2))
|
t.Fatalf("Unexpected diff size %d, expected %d", layer2DiffSize, len(content2))
|
||||||
}
|
}
|
||||||
|
|
||||||
layer2Size, err := layer2.Size()
|
layer2Size := layer2.Size()
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if expected := len(content1) + len(content2); int(layer2Size) != expected {
|
if expected := len(content1) + len(content2); int(layer2Size) != expected {
|
||||||
t.Fatalf("Unexpected size %d, expected %d", layer2Size, expected)
|
t.Fatalf("Unexpected size %d, expected %d", layer2Size, expected)
|
||||||
|
|
|
@ -73,19 +73,17 @@ func (rl *roLayer) Parent() Layer {
|
||||||
return rl.parent
|
return rl.parent
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rl *roLayer) Size() (size int64, err error) {
|
func (rl *roLayer) Size() int64 {
|
||||||
|
size := rl.size
|
||||||
if rl.parent != nil {
|
if rl.parent != nil {
|
||||||
size, err = rl.parent.Size()
|
size += rl.parent.Size()
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return size + rl.size, nil
|
return size
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rl *roLayer) DiffSize() (size int64, err error) {
|
func (rl *roLayer) DiffSize() int64 {
|
||||||
return rl.size, nil
|
return rl.size
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rl *roLayer) Metadata() (map[string]string, error) {
|
func (rl *roLayer) Metadata() (map[string]string, error) {
|
||||||
|
|
Loading…
Reference in New Issue