InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50328 from thaJeztah/rm_LogReleaseMetadata

Browse Source 
layer: remove LogReleaseMetadata utility
This commit is contained in:
Sebastiaan van Stijn
2025-07-07 21:27:04 +02:00
committed by GitHub
parent 42701c5406 557b5d60d3
commit 1284a44efa
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/images/image_builder.go
View File

@@ -45,7 +45,9 @@ func (l *roLayer) Release() error {
}
if l.roLayer != nil {
metadata, err := l.layerStore.Release(l.roLayer)
layer.LogReleaseMetadata(metadata)
for _, m := range metadata {
log.G(context.TODO()).WithField("chainID", m.ChainID).Infof("release ROLayer: cleaned up layer %s", m.ChainID)
}
if err != nil {
return errors.Wrap(err, "failed to release ROLayer")
}
@@ -124,7 +126,9 @@ func (l *rwLayer) Release() error {
}
metadata, err := l.layerStore.ReleaseRWLayer(l.rwLayer)
layer.LogReleaseMetadata(metadata)
for _, m := range metadata {
log.G(context.TODO()).WithField("chainID", m.ChainID).Infof("release RWLayer: cleaned up layer %s", m.ChainID)
}
if err != nil {
return errors.Wrap(err, "failed to release RWLayer")
}

5
daemon/images/service.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/log"
"github.com/docker/docker/daemon/container"
daemonevents "github.com/docker/docker/daemon/events"
"github.com/docker/docker/distribution"
@@ -190,7 +191,9 @@ func (i *ImageService) ReleaseLayer(rwlayer container.RWLayer) error {
}
metaData, err := i.layerStore.ReleaseRWLayer(l)
layer.LogReleaseMetadata(metaData)
for _, m := range metaData {
log.G(context.TODO()).WithField("chainID", m.ChainID).Infof("release RWLayer: cleaned up layer %s", m.ChainID)
}
if err != nil && !errors.Is(err, layer.ErrMountDoesNotExist) && !errors.Is(err, os.ErrNotExist) {
return errors.Wrapf(err, "driver %q failed to remove root filesystem",
i.layerStore.DriverName())

10
layer/layer.go
View File

@@ -194,13 +194,7 @@ func ReleaseAndLog(ls Store, l Layer) {
if err != nil {
log.G(context.TODO()).Errorf("Error releasing layer %s: %v", l.ChainID(), err)
}
LogReleaseMetadata(metadata)
}
// LogReleaseMetadata logs a metadata array, uses this to
// ensure consistent logging for release metadata
func LogReleaseMetadata(metadatas []Metadata) {
for _, metadata := range metadatas {
log.G(context.TODO()).Infof("Layer %s cleaned up", metadata.ChainID)
for _, m := range metadata {
log.G(context.TODO()).WithField("chainID", m.ChainID).Infof("Cleaned up layer %s", m.ChainID)
}
}