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.

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

optimize garabge collection command #4808

Merged

Conversation

ozer550
Copy link
Member

@ozer550 ozer550 commented Nov 8, 2024

Summary

Restructure the way we run the query while deleting user_related data to stop the garbage_collection command from stalling.

Description of the change(s) you made

  • Calculate tree_id separately instead of in the subquery.
  • Run the query once to set the parent_id.

How can a reviewer test these changes?

  • Restored production database to hotfixes environment
  • Manually started the job
  • Observed running querie

Are there any risky areas that deserve extra testing?

References

closes #4780

Comments

We need to have the settings.DEBUG=True to log the queries.

Contributor's Checklist

PR process:

  • If this is an important user-facing change, PR or related issue the CHANGELOG label been added to this PR. Note: items with this label will be added to the CHANGELOG at a later time
  • If this includes an internal dependency change, a link to the diff is provided
  • The docs label has been added if this introduces a change that needs to be updated in the user docs?
  • If any Python requirements have changed, the updated requirements.txt files also included in this PR
  • Opportunities for using Google Analytics here are noted
  • Migrations are safe for a large db

Studio-specifc:

  • All user-facing strings are translated properly
  • The notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)
  • All UI components are LTR and RTL compliant
  • Views are organized into pages, components, and layouts directories as described in the docs
  • Users' storage used is recalculated properly on any changes to main tree files
  • If there new ways this uses user data that needs to be factored into our Privacy Policy, it has been noted.

Testing:

  • Code is clean and well-commented
  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Any new interactions have been added to the QA Sheet
  • Critical and brittle code paths are covered by unit tests

Reviewer's Checklist

This section is for reviewers to fill out.

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@ozer550 ozer550 requested a review from bjester November 8, 2024 09:03
ContentNode.objects.values_list('id', 'main_tree__tree_id')
)

logging.debug("Queries after creating channel tree ID map: %s", connection.queries)
Copy link
Member Author

Choose a reason for hiding this comment

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

We need settings.DEBUG = True to get the queries printed.

Copy link
Member

@bjester bjester left a comment

Choose a reason for hiding this comment

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

Sorry it seems there was some confusion with my last feedback. We should be able to use non_public_channels_sole_editor to iterate over its tree ID's, instead of looping over all channels

# our garbage collection delete the nodes and underlying file.
channel_tree_id_map = dict(
Channel.objects.values_list('id', 'main_tree__tree_id')
)
Copy link
Member

Choose a reason for hiding this comment

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

Ah this is a lot of channels! I meant iterating over the tree_id using non_public_channels_sole_editor. This won't work well either

Copy link
Member Author

Choose a reason for hiding this comment

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

oh yes, my apologies now I see it that was an unnecessary overhead!

@ozer550 ozer550 requested a review from bjester November 13, 2024 10:20
Copy link
Member

@bjester bjester left a comment

Choose a reason for hiding this comment

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

I think this should work a lot better! Thanks @ozer550

@bjester bjester merged commit eb3aadc into learningequality:hotfixes Nov 14, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants