Skip to content

Bug 2070805: pkg/cvo/updatepayload: Prune previous payload downloads #760

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 4, 2022
Merged

Bug 2070805: pkg/cvo/updatepayload: Prune previous payload downloads #760

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
41 changes: 21 additions & 20 deletions pkg/cvo/updatepayload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,28 @@ func (r *payloadRetriever) targetUpdatePayloadDir(ctx context.Context, update co
hash := md5.New()
hash.Write([]byte(update.Image))
payloadHash := base64.RawURLEncoding.EncodeToString(hash.Sum(nil))

tdir := filepath.Join(r.workingDir, payloadHash)
err := payload.ValidateDirectory(tdir)
if os.IsNotExist(err) {
// the dirs don't exist, try fetching the payload to tdir.
err = r.fetchUpdatePayloadToDir(ctx, tdir, update)

// Prune older jobs and directories while gracefully handling errors.
if err := r.pruneJobs(ctx, 0); err != nil {
klog.Warningf("failed to prune jobs: %v", err)
}
if err != nil {
if files, err := os.ReadDir(r.workingDir); err != nil {
klog.Warningf("failed to list update payload directory: %v", err)
} else {
for _, file := range files {
if err := os.RemoveAll(filepath.Join(r.workingDir, file.Name())); err != nil {
klog.Warningf("failed to prune update payload directory: %v", err)
}
}
}

if err := payload.ValidateDirectory(tdir); os.IsNotExist(err) {
// the dirs don't exist, try fetching the payload to tdir.
if err := r.fetchUpdatePayloadToDir(ctx, tdir, update); err != nil {
return "", err
}
} else if err != nil {
return "", err
}

Expand Down Expand Up @@ -217,14 +231,7 @@ func (r *payloadRetriever) fetchUpdatePayloadToDir(ctx context.Context, dir stri
},
}

// Prune older jobs while gracefully handling errors.
err := r.pruneJobs(ctx, 2)
if err != nil {
klog.Warningf("failed to prune jobs: %v", err)
}

_, err = r.kubeClient.BatchV1().Jobs(job.Namespace).Create(ctx, job, metav1.CreateOptions{})
if err != nil {
if _, err := r.kubeClient.BatchV1().Jobs(job.Namespace).Create(ctx, job, metav1.CreateOptions{}); err != nil {
return err
}
return resourcebuilder.WaitForJobCompletion(ctx, r.kubeClient.BatchV1(), job)
Expand All @@ -248,12 +255,6 @@ func (r *payloadRetriever) pruneJobs(ctx context.Context, retain int) error {
// Ignore jobs not beginning with operatorName
case !strings.HasPrefix(job.Name, r.operatorName+"-"):
break
Copy link
Copy Markdown
Contributor

@jottofar jottofar Apr 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it that we no longer have to ignore jobs that have not yet started or are still active? Will these never show up now because they will have been pruned?

Copy link
Copy Markdown
Member Author

@wking wking Apr 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when we are getting ready to launch the new job, we have already given up on the old job, so we are pruning those, even if they were still pending or running. The new job will succeed, or not, and will remain around until the CVO decides to launch a successor.

// Ignore jobs that have not yet started
case job.Status.StartTime == nil:
break
// Ignore jobs that are still active
case job.Status.Active == 1:
break
default:
deleteJobs = append(deleteJobs, job)
}
Expand Down