Skip to content

Add job delete support #4717

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
Merged
merged 10 commits into from
Jun 5, 2025
Merged

Add job delete support #4717

merged 10 commits into from
Jun 5, 2025

Conversation

bcl
Copy link
Contributor

@bcl bcl commented May 7, 2025

This pull request includes:

  • adequate testing for the new functionality or fixed issue
  • adequate documentation informing people about the change such as
    • submit a PR for the READMEs listed here
    • submit a PR for the osbuild.org website repository if this PR changed any behavior not covered by the automatically updated READMEs

lzap
lzap reviewed May 7, 2025
View reviewed changes
lzap
lzap reviewed May 7, 2025
View reviewed changes
lzap
lzap reviewed May 7, 2025
View reviewed changes
lzap
lzap reviewed May 7, 2025
View reviewed changes
lzap
lzap reviewed May 7, 2025
View reviewed changes
@lzap
Copy link
Contributor

lzap commented May 7, 2025

Dropped some random stuff, this is not a review as I do not feel confident to do that yet.

@bcl bcl force-pushed the main-delete-jobs branch 2 times, most recently from eca164d to ab73a24 Compare May 13, 2025 17:07
@bcl bcl force-pushed the main-delete-jobs branch from ab73a24 to 055857f Compare May 16, 2025 23:10
@bcl
Copy link
Contributor Author

bcl commented May 16, 2025

Note that Snyk is wrong, no directory traversal is possible since it uses uuid.Parse() to make sure the id is a uuid not some arbitrary string.

@bcl bcl marked this pull request as ready for review May 16, 2025 23:28
@bcl bcl requested review from thozza and a team as code owners May 16, 2025 23:28
@bcl bcl requested review from mvo5 and achilleas-k and removed request for a team May 16, 2025 23:28
lzap
lzap previously approved these changes May 19, 2025
View reviewed changes
Copy link
Contributor

@lzap lzap left a comment

Choose a reason for hiding this comment

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

Thanks for adding those contexts.

@bcl bcl force-pushed the main-delete-jobs branch 3 times, most recently from 461e9eb to abe1fc1 Compare May 22, 2025 17:43
lzap
lzap previously approved these changes May 26, 2025
View reviewed changes
Copy link
Contributor

@lzap lzap left a comment

Choose a reason for hiding this comment

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

Yeah this is great! Small nitpick, but this is ready.

Someone else please review!

thozza
thozza approved these changes May 26, 2025
View reviewed changes
Copy link
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

Thanks for the PR.

I've added a few questions inline and agree with @lzap's comment about carrying ctx when interacting with the DB. The rest LGTM.

thozza
thozza requested changes May 26, 2025
View reviewed changes
Copy link
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

Sorry, I misclicked. I wanted to request changes, instead of approving 😇

@bcl bcl force-pushed the main-delete-jobs branch from abe1fc1 to 3d8d038 Compare May 29, 2025 16:31
@bcl bcl requested a review from thozza May 29, 2025 16:31
bcl added 3 commits May 30, 2025 11:26
@bcl
jsondb: Add Delete function
2f7e79d 
This allows database entries to be deleted.

Related: RHEL-60120
@bcl
jobqueue: Add DeleteJob function
bff2361 
This allows jobs to be deleted from the database.
Currently only implemented by fsjobqueue. The function for
dbjobqueue currently returns nil.

This will remove all the job files used by the root job UUID as long as
no other job depends on them. ie. It starts at the top, and moves down
the dependency tree until it finds a job that is also used by another
job, removes the job to be deleted from its dependants list, and moves
back up the tree only deleting jobs with empty dependants lists.

Related: RHEL-60120
@bcl
dbjobqueue: Add AllRootJobIDs implementation
b57a5b7 
Related: RHEL-60120
bcl added 7 commits May 30, 2025 11:26
@bcl
dbjobqueue: Add DeleteJob to database job queue
f94ed3a 
This adds SQL to delete jobs and dependencies, and implements the
database version of the DeleteJob function.

Related: RHEL-60120
@bcl
jobqueuetest: Add job delete tests
52b9953 
This adds tests for retrieving all root jobs, and deleting jobs
and unused dependencies. These tests are run against the fsjobqueue for
unit testing, and against dbjobqueue for integration testing.

Resolves: RHEL-60120
@bcl
worker: Add CleanupArtifacts function
4b0fdc2 
This removes all artifact directories, and their contents, if there
isn't an associated Job. This is used to clean up local artifacts after
the compose job has been deleted.

Related: RHEL-60120
@bcl
cloudapi: Add DELETE /composes/{id} route to delete a job
7ced792 
This will be used to delete jobs and their artifacts.

Related: RHEL-60120
@bcl
cloudapi: Add DeleteCompose to delete a job by UUID
a259004 
This adds the handler for DELETE /composes/{id} which will delete a job and
all of its dependencies, and any artifacts.

Related: RHEL-60120
@bcl
cloudapi: Add artifact cleanup to delete handler
addb048 
Related: RHEL-60120
@bcl
cloudapi: Fix listing composes with empty result
43adaec 
It was returning a null body instead of an empty list.

Related: RHEL-60120
@bcl bcl force-pushed the main-delete-jobs branch from 3d8d038 to 43adaec Compare May 30, 2025 21:51
thozza
thozza approved these changes Jun 5, 2025
View reviewed changes
Copy link
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

All good. Thanks for the changes and your patience!

thozza
thozza reviewed Jun 5, 2025
View reviewed changes
@thozza thozza enabled auto-merge (rebase) June 5, 2025 08:32
@thozza thozza merged commit 12dd0b0 into osbuild:main Jun 5, 2025
45 of 48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thozza thozza thozza approved these changes

@lzap lzap lzap approved these changes

@mvo5 mvo5 Awaiting requested review from mvo5 mvo5 is a code owner automatically assigned from osbuild/osbuild-reviewers

@achilleas-k achilleas-k Awaiting requested review from achilleas-k achilleas-k is a code owner automatically assigned from osbuild/osbuild-reviewers

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bcl @lzap @thozza