job archive interface: clean up a couple helper functions #460
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jameshcorbett
requested changes
Jun 27, 2024
src/bindings/python/fluxacct/accounting/job_archive_interface.py
Outdated
Show resolved
Hide resolved
Problem: There are a few improvements that can be made to enhance readability, efficiency, and maintainability of this function. Simplify the construction of the params dictionary. Use f-strings for string formatting of the SELECT statement and WHERE clauses. Remove the unnecessary check for len(result) == 0 since we can just return an empty list if no records are found.
Problem: The add_job_records() function does not handle the case where a ResourceSet object cannot be created out of the R fetched for each job. Add a try-except block for this, and just skip adding the record in the case where the creation of the ResourceSet object does not work since it will not contribute to an association's job usage or fair-share value.
cmoussa1
force-pushed
the
view.jobs.cleanup
branch
2 times, most recently
from
37749de to
208570d
Compare
jameshcorbett
approved these changes
Jun 28, 2024
| # one of their secondary banks; this will determine how we filter the | ||
| # job records we've found | ||
| is_default_bank = bank == default_bank | ||
| bank = bank if bank != default_bank else default_bank |
There was a problem hiding this comment.
Isn't this line not doing anything? Like wouldn't bank come out unchanged after going through this if/else statement?
There was a problem hiding this comment.
🤦 you're absolutely right. Sorry about that. I'll remove this line. Thanks for pointing that out!
cmoussa1
force-pushed
the
view.jobs.cleanup
branch
from
208570d to
e1c7087
Compare
|
Thanks for reviewing this @jameshcorbett and for putting up with this old code 😆 gonna set MWP here |
|
@Mergifyio refresh |
✅ Pull request refreshed |
|
@Mergifyio requeue |
☑️ This pull request is already queued |
|
@Mergifyio dequeue |
✅ The pull request has been removed from the queue
|
|
@Mergifyio requeue |
✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically |
Problem: The def_bank_jobs() and sec_bank_jobs() helper functions are very similar and could be condensed into one helper function. Combine the two into one filter_jobs_by_bank() function. Add another parameter to the function definition to handle the case for jobs that do not specify any bank. Use this new helper function in get_job_records().
cmoussa1
force-pushed
the
view.jobs.cleanup
branch
from
e1c7087 to
caee39f
Compare
|
Looks like re-pushing helped get this merged. Great suggestion @grondo! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
There are a few functions in
job_archive_interface.pythat could use some improvements to their error handling and parameter and string construction. There's also some opportunity for some duplicate code cleanup.This PR just makes some minor cleanup in a couple of functions in
job_archive_interface.py. Notably, it reduces a couple of unnecessary checks inget_job_records()and makes use of f-strings for the query construction.Some duplicate code is cleaned up in the helper functions for filtering jobs by default/secondary banks by reducing them into just one
filter_jobs_by_bank()function.Some more explicit error handling is added to
add_job_records()to handle the case where the construction of aResourceSetobject fails while parsing job records.