Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust exporter App Layer log output #1399

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Adjust exporter App Layer log output #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions phase/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,13 +446,16 @@ func (e *Exporter) addLauncherLayers(opts ExportOptions, buildMD *files.BuildMet

func (e *Exporter) addAppLayers(opts ExportOptions, slices []layers.Slice, meta *files.LayersMetadata) error {
// creating app layers (slices + app dir)
e.Logger.Debugf("Adding app layers")

sliceLayers, err := e.LayerFactory.SliceLayers(opts.AppDir, slices)
if err != nil {
return errors.Wrap(err, "creating app layers")
}

var numberOfReusedLayers int
for _, slice := range sliceLayers {
e.Logger.Debugf("Layer '%s' SHA: %s\n", slice.ID, slice.Digest)
var err error

found := false
Expand All @@ -471,16 +474,15 @@ func (e *Exporter) addAppLayers(opts ExportOptions, slices []layers.Slice, meta
if err != nil {
return err
}
e.Logger.Debugf("Layer '%s' SHA: %s\n", slice.ID, slice.Digest)
meta.App = append(meta.App, files.LayerMetadata{SHA: slice.Digest})
}

delta := len(sliceLayers) - numberOfReusedLayers
if numberOfReusedLayers > 0 {
e.Logger.Infof("Reusing %d/%d app layer(s)\n", numberOfReusedLayers, len(sliceLayers))
e.Logger.Infof("Reused %d/%d app layer(s)\n", numberOfReusedLayers, len(sliceLayers))
}
if delta != 0 {
e.Logger.Infof("Adding %d/%d app layer(s)\n", delta, len(sliceLayers))
e.Logger.Infof("Added %d/%d app layer(s)\n", delta, len(sliceLayers))
}
return nil
}
Expand Down
10 changes: 5 additions & 5 deletions phase/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ func testExporter(t *testing.T, when spec.G, it spec.S) {
_, err := exporter.Export(opts)
h.AssertNil(t, err)
h.AssertContains(t, fakeAppImage.ReusedLayers(), "slice-1-digest")
assertLogEntry(t, logHandler, "Reusing 1/3 app layer(s)")
assertLogEntry(t, logHandler, "Adding 2/3 app layer(s)")
assertLogEntry(t, logHandler, "Reused 1/3 app layer(s)")
assertLogEntry(t, logHandler, "Added 2/3 app layer(s)")
})
})

Expand All @@ -248,7 +248,7 @@ func testExporter(t *testing.T, when spec.G, it spec.S) {
h.AssertNil(t, err)

assertHasLayer(t, fakeAppImage, "app")
assertLogEntry(t, logHandler, "Adding 1/1 app layer(s)")
assertLogEntry(t, logHandler, "Added 1/1 app layer(s)")
})

it("creates config layer on Run image", func() {
Expand Down Expand Up @@ -873,7 +873,7 @@ version = "4.5.6"
it("exports slice layers", func() {
_, err := exporter.Export(opts)
h.AssertNil(t, err)
assertLogEntry(t, logHandler, "Adding 3/3 app layer(s)")
assertLogEntry(t, logHandler, "Added 3/3 app layer(s)")
})
})

Expand Down Expand Up @@ -906,7 +906,7 @@ version = "4.5.6"
h.AssertNil(t, err)

assertHasLayer(t, fakeAppImage, "app")
assertLogEntry(t, logHandler, "Adding 1/1 app layer(s)")
assertLogEntry(t, logHandler, "Added 1/1 app layer(s)")
})

it("creates config layer on Run image", func() {
Expand Down
Loading