Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(report): fix panic occured when using final-repo and report 
Panic occurs when published image in the primary repo becomes broken (MANIFEST_UNKNOWN), despite the fact it is listed in the repository tags.

* Reworked report information gathering to use cached stage description for report when possible.
* Check final repo for image existance and repush this image when manifest becomes broken.

Signed-off-by: Timofey Kirillov <timofey.kirillov@flant.com>
  • Loading branch information
@distorhead
distorhead committed Dec 8, 2022
1 parent 7f4530d commit e62cd78
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 37 deletions.
20 changes: 4 additions & 16 deletions pkg/build/build_phase.go
View file
Expand Up @@ -179,22 +179,10 @@ func (phase *BuildPhase) createReport(ctx context.Context) error {
continue
}

var desc *imagePkg.StageDescription
stageImage := img.GetLastNonEmptyStage().GetStageImage()
stageID := stageImage.Image.GetStageDescription().StageID

if phase.Conveyor.StorageManager.GetFinalStagesStorage() != nil {
var err error
desc, err = phase.Conveyor.StorageManager.GetFinalStagesStorage().GetStageDescription(ctx, phase.Conveyor.ProjectName(), stageID.Digest, stageID.UniqueID)
if err != nil {
return fmt.Errorf("unable to get stage %s descriptor from final repo %s: %w", stageID.String(), phase.Conveyor.StorageManager.GetFinalStagesStorage().String(), err)
}
} else {
var err error
desc, err = phase.Conveyor.StorageManager.GetStagesStorage().GetStageDescription(ctx, phase.Conveyor.ProjectName(), stageID.Digest, stageID.UniqueID)
if err != nil {
return fmt.Errorf("unable to get stage %s descriptor from primary repo %s: %w", stageID.String(), phase.Conveyor.StorageManager.GetStagesStorage().String(), err)
}
stageImage := img.GetLastNonEmptyStage().GetStageImage().Image
desc := stageImage.GetFinalStageDescription()
if desc == nil {
desc = stageImage.GetStageDescription()
}

phase.ImagesReport.SetImageRecord(img.GetName(), ReportImageRecord{
Expand Down
15 changes: 12 additions & 3 deletions pkg/container_backend/legacy_base_image.go
View file
Expand Up @@ -8,9 +8,10 @@ import (
)

type legacyBaseImage struct {
name string
info *image.Info
stageDesc *image.StageDescription
name string
info *image.Info
stageDesc *image.StageDescription
finalStageDesc *image.StageDescription

ContainerBackend ContainerBackend
}
Expand Down Expand Up @@ -64,6 +65,14 @@ func (i *legacyBaseImage) GetStageDescription() *image.StageDescription {
return i.stageDesc
}

func (i *legacyBaseImage) SetFinalStageDescription(stageDesc *image.StageDescription) {
i.finalStageDesc = stageDesc
}

func (i *legacyBaseImage) GetFinalStageDescription() *image.StageDescription {
return i.finalStageDesc
}

func (i *legacyBaseImage) IsExistsLocally() bool {
return i.info != nil
}
5 changes: 4 additions & 1 deletion pkg/container_backend/legacy_interface.go
View file
Expand Up @@ -22,6 +22,7 @@ type LegacyImageInterface interface {
// TODO: should be under a single separate interface
Container() LegacyContainer
BuilderContainer() LegacyBuilderContainer
SetCommitChangeOptions(opts LegacyCommitChangeOptions)

Build(context.Context, BuildOptions) error
SetBuiltID(builtID string)
Expand All @@ -37,7 +38,9 @@ type LegacyImageInterface interface {

SetStageDescription(stage *image.StageDescription)
GetStageDescription() *image.StageDescription
SetCommitChangeOptions(opts LegacyCommitChangeOptions)

GetFinalStageDescription() *image.StageDescription
SetFinalStageDescription(stage *image.StageDescription)

GetCopy() LegacyImageInterface
}
Expand Down
45 changes: 28 additions & 17 deletions pkg/storage/manager/storage_manager.go
View file
Expand Up @@ -415,28 +415,28 @@ func doFetchStage(ctx context.Context, projectName string, stagesStorage storage
})
}

func copyStageIntoStagesStorage(ctx context.Context, projectName string, stageID image.StageID, img container_backend.LegacyImageInterface, stagesStorage storage.StagesStorage, containerBackend container_backend.ContainerBackend) error {
func copyStageIntoStagesStorage(ctx context.Context, projectName string, stageID image.StageID, img container_backend.LegacyImageInterface, stagesStorage storage.StagesStorage, containerBackend container_backend.ContainerBackend) (*image.StageDescription, error) {
newImg := img.GetCopy()

targetStagesStorageImageName := stagesStorage.ConstructStageImageName(projectName, stageID.Digest, stageID.UniqueID)

if err := containerBackend.RenameImage(ctx, newImg, targetStagesStorageImageName, false); err != nil {
return fmt.Errorf("unable to rename image %s to %s: %w", img.Name(), targetStagesStorageImageName, err)
return nil, fmt.Errorf("unable to rename image %s to %s: %w", img.Name(), targetStagesStorageImageName, err)
}

if err := stagesStorage.StoreImage(ctx, newImg); err != nil {
return fmt.Errorf("unable to store stage %s into the cache stages storage %s: %w", stageID.String(), stagesStorage.String(), err)
return nil, fmt.Errorf("unable to store stage %s into the cache stages storage %s: %w", stageID.String(), stagesStorage.String(), err)
}

if err := storeStageDescriptionIntoLocalManifestCache(ctx, projectName, stageID, stagesStorage, ConvertStageDescriptionForStagesStorage(newImg.GetStageDescription(), stagesStorage)); err != nil {
return fmt.Errorf("error storing stage %s description into local manifest cache: %w", targetStagesStorageImageName, err)
return nil, fmt.Errorf("error storing stage %s description into local manifest cache: %w", targetStagesStorageImageName, err)
}

if err := lrumeta.CommonLRUImagesCache.AccessImage(ctx, targetStagesStorageImageName); err != nil {
return fmt.Errorf("error accessing last recently used images cache for %s: %w", targetStagesStorageImageName, err)
return nil, fmt.Errorf("error accessing last recently used images cache for %s: %w", targetStagesStorageImageName, err)
}

return nil
return newImg.GetStageDescription(), nil
}

func (m *StorageManager) FetchStage(ctx context.Context, containerBackend container_backend.ContainerBackend, stg stage.Interface) error {
Expand Down Expand Up @@ -579,14 +579,14 @@ func (m *StorageManager) FetchStage(ctx context.Context, containerBackend contai
})

if IsErrStageNotFound(err) {
logboek.Context(ctx).Error().LogF("Stage is no longer available in the %q!\n", stg.LogDetailedName(), stg.GetStageImage().Image.Name(), m.StagesStorage.String(), m.ProjectName)
logboek.Context(ctx).Error().LogF("Stage %s image %s is no longer available!\n", stg.LogDetailedName(), stg.GetStageImage().Image.Name())
return ErrUnexpectedStagesStorageState
}

if storage.IsErrBrokenImage(err) {
logboek.Context(ctx).Error().LogF("Invalid stage %q!\n", stg.LogDetailedName(), stg.GetStageImage().Image.Name(), m.StagesStorage.String(), m.ProjectName)
logboek.Context(ctx).Error().LogF("Broken stage %s image %s!\n", stg.LogDetailedName(), stg.GetStageImage().Image.Name())

logboek.Context(ctx).Error().LogF("Will mark image %q as rejected in the stages storage %s\n", stg.GetStageImage().Image.Name(), m.StagesStorage.String())
logboek.Context(ctx).Error().LogF("Will mark image %s as rejected in the stages storage %s\n", stg.GetStageImage().Image.Name(), m.StagesStorage.String())
if err := m.StagesStorage.RejectStage(ctx, m.ProjectName, stageID.Digest, stageID.UniqueID); err != nil {
return fmt.Errorf("unable to reject stage %s image %s in the stages storage %s: %w", stg.LogDetailedName(), stg.GetStageImage().Image.Name(), m.StagesStorage.String(), err)
}
Expand All @@ -606,7 +606,7 @@ func (m *StorageManager) FetchStage(ctx context.Context, containerBackend contai

err := logboek.Context(ctx).Default().LogProcess("Copy stage %s into cache %s", stg.LogDetailedName(), cacheStagesStorage.String()).
DoError(func() error {
if err := copyStageIntoStagesStorage(ctx, m.ProjectName, *stageID, fetchedImg, cacheStagesStorage, containerBackend); err != nil {
if _, err := copyStageIntoStagesStorage(ctx, m.ProjectName, *stageID, fetchedImg, cacheStagesStorage, containerBackend); err != nil {
return fmt.Errorf("unable to copy stage %s into cache stages storage %s: %w", stageID.String(), cacheStagesStorage.String(), err)
}
return nil
Expand All @@ -626,7 +626,7 @@ func (m *StorageManager) CopyStageIntoCacheStorages(ctx context.Context, stg sta

err := logboek.Context(ctx).Default().LogProcess("Copy stage %s into cache %s", stg.LogDetailedName(), cacheStagesStorage.String()).
DoError(func() error {
if err := copyStageIntoStagesStorage(ctx, m.ProjectName, *stageID, img.Image, cacheStagesStorage, containerBackend); err != nil {
if _, err := copyStageIntoStagesStorage(ctx, m.ProjectName, *stageID, img.Image, cacheStagesStorage, containerBackend); err != nil {
return fmt.Errorf("unable to copy stage %s into cache stages storage %s: %w", stageID.String(), cacheStagesStorage.String(), err)
}
return nil
Expand Down Expand Up @@ -669,16 +669,25 @@ func (m *StorageManager) CopyStageIntoFinalStorage(ctx context.Context, stg stag
logboek.Context(ctx).Debug().LogF("[%p] Got existing final stages list cache: %#v\n", m, existingStagesListCache.StageIDs)

stageID := stg.GetStageImage().Image.GetStageDescription().StageID
finalImageName := m.FinalStagesStorage.ConstructStageImageName(m.ProjectName, stageID.Digest, stageID.UniqueID)

finalImageName := m.GetFinalStagesStorage().ConstructStageImageName(m.ProjectName, stageID.Digest, stageID.UniqueID)

for _, existingStg := range existingStagesListCache.GetStageIDs() {
if existingStg.IsEqual(*stageID) {
logboek.Context(ctx).Info().LogF("Stage %s already exists in the final repo, skipping\n", stageID.String())
desc, err := m.GetFinalStagesStorage().GetStageDescription(ctx, m.ProjectName, stageID.Digest, stageID.UniqueID)
if err != nil {
return fmt.Errorf("unable to get stage %s descriptor from final repo %s: %w", stageID.String(), m.GetFinalStagesStorage().String(), err)
}
if desc != nil {
stg.GetStageImage().Image.SetFinalStageDescription(desc)

logboek.Context(ctx).Default().LogFHighlight("Use cache final image for %s\n", stg.LogDetailedName())
container_backend.LogImageName(ctx, finalImageName)
logboek.Context(ctx).Info().LogF("Stage %s already exists in the final repo, skipping\n", stageID.String())

return nil
logboek.Context(ctx).Default().LogFHighlight("Use cache final image for %s\n", stg.LogDetailedName())
container_backend.LogImageName(ctx, finalImageName)

return nil
}
}
}

Expand All @@ -697,8 +706,10 @@ func (m *StorageManager) CopyStageIntoFinalStorage(ctx context.Context, stg stag
options.Style(style.Highlight())
}).
DoError(func() error {
if err := copyStageIntoStagesStorage(ctx, m.ProjectName, *stageID, img.Image, m.FinalStagesStorage, containerBackend); err != nil {
if desc, err := copyStageIntoStagesStorage(ctx, m.ProjectName, *stageID, img.Image, m.FinalStagesStorage, containerBackend); err != nil {
return fmt.Errorf("unable to copy stage %s into the final repo %s: %w", stageID.String(), m.FinalStagesStorage.String(), err)
} else {
stg.GetStageImage().Image.SetFinalStageDescription(desc)
}

logboek.Context(ctx).Default().LogFDetails(" name: %s\n", finalImageName)
Expand Down

0 comments on commit e62cd78

Please sign in to comment.