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

Introduces additional states for handling new versions of Flux #407

Merged
merged 1 commit into from
Dec 1, 2022

Conversation

FrankD412
Copy link
Member

This MR introduces state changes that allow Maestro to work with newer versions of Flux that have new state abbreviations for job status. The change is pulled from @Jmast's comment here.

@FrankD412 FrankD412 added Bugfix Discussion/Implementation of a solution to a bug (usually a PR) Adapters Items that are directly related to Maestro's adapter structure. labels Nov 26, 2022
@FrankD412 FrankD412 requested a review from jwhite242 November 26, 2022 02:12
@FrankD412 FrankD412 self-assigned this Nov 26, 2022
@FrankD412 FrankD412 force-pushed the fdinatale/bugfix/flux_states branch from 35bd1d7 to cdaf476 Compare November 26, 2022 02:14
@FrankD412
Copy link
Member Author

@jwhite -- might it be time to drop some older support for Flux versions and settle on the latest going forward?

@jwhite242
Copy link
Collaborator

@jwhite -- might it be time to drop some older support for Flux versions and settle on the latest going forward?

we should definitely make the newest one the default. should we mark a few of the old ones deprecated first? -> i.e. drop 0.12 and 0.17 in a future release (dunno if we need to wait for 2.0 for this?)

Copy link
Collaborator

@jwhite242 jwhite242 left a comment

Choose a reason for hiding this comment

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

Looks good, and thanks for picking this up after I lost track of it there!

One more comment, while I'm not sure I found the actual origin of the changes digging through flux's code, this bit in their docs suggests even the 0.17 adapter had some incorrect states: flux-framework/flux-core@464f247#diff-bdee90e6504065e198ac97b425af3981da5784e4900ef3b0feeee76cb02e5d70R57

But, per your other question maybe we shouldn't care about correcting this old stuff and rather just drop those older ones?

@FrankD412
Copy link
Member Author

Yeah -- I'm starting to think that might be worthwhile as Flux becomes more mature.

@FrankD412 FrankD412 merged commit 6d0bd1b into develop Dec 1, 2022
@FrankD412 FrankD412 deleted the fdinatale/bugfix/flux_states branch December 1, 2022 04:16
jwhite242 added a commit that referenced this pull request Dec 12, 2023
1.1.10 Release (#432)

* Sync up read the docs config with dev environments using poetry (#399)
* Print usage on command line when no args are provided (#404)
* Add sacct fallback to slurm adapter to improve robustness of job tracking (#405)
* Update Flurm Job State mappings for flux versions >= 0.26 (#407)
* Bump certifi from 2021.10.8 to 2022.12.7 to address security issue (#409)
* Bump cryptography from 37.0.1 to 38.0.3 to address security issue (#410)
* Add missing shbang in unscheduled scripts from lsf adapter (#411)
* Update poetry lockfile to address dependabot flagged security issues (#412)
* Fix for Dockerfile smell DL3006 (#418)
* Port Maestro documentation to mkdocs and expand coverage of features and tutorials (#403)
* Update version info to be driven from pyproject.toml exclusively, and hook up to command line (#419)
* Pin mermaid to < 10.x due to api change (#422)
* Bump lock file certifi from 2022.12.7 to 2023.7.22 to address security issue (#426)
* Refactor flux adapter to avoid using pickle to talk to flux brokers installed in external environments (#415)
   Also adds flux integration tests to exercise against real flux brokers
* Add pager functionality to status command (#420)
* Patch broken flux job cancellation (#428)
* Insulate slurm adapters from user customization of squeue and sacct output formats (#431)
   Also adds live unit and integration tests for slurm adapter

---------

Co-authored-by: Francesco Di Natale <frank.dinatale1988@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bruno P. Kinoshita <kinow@users.noreply.github.com>
Co-authored-by: Charles Doutriaux <doutriaux1@llnl.gov>
Co-authored-by: Giovanni Rosa <grosa23@yahoo.com>
Co-authored-by: Brian Gunnarson <49216024+bgunnar5@users.noreply.github.com>
jwhite242 added a commit that referenced this pull request Feb 6, 2024
1.1.10 Release (#432)

* Sync up read the docs config with dev environments using poetry (#399)
* Print usage on command line when no args are provided (#404)
* Add sacct fallback to slurm adapter to improve robustness of job tracking (#405)
* Update Flurm Job State mappings for flux versions >= 0.26 (#407)
* Bump certifi from 2021.10.8 to 2022.12.7 to address security issue (#409)
* Bump cryptography from 37.0.1 to 38.0.3 to address security issue (#410)
* Add missing shbang in unscheduled scripts from lsf adapter (#411)
* Update poetry lockfile to address dependabot flagged security issues (#412)
* Fix for Dockerfile smell DL3006 (#418)
* Port Maestro documentation to mkdocs and expand coverage of features and tutorials (#403)
* Update version info to be driven from pyproject.toml exclusively, and hook up to command line (#419)
* Pin mermaid to < 10.x due to api change (#422)
* Bump lock file certifi from 2022.12.7 to 2023.7.22 to address security issue (#426)
* Refactor flux adapter to avoid using pickle to talk to flux brokers installed in external environments (#415)
   Also adds flux integration tests to exercise against real flux brokers
* Add pager functionality to status command (#420)
* Patch broken flux job cancellation (#428)
* Insulate slurm adapters from user customization of squeue and sacct output formats (#431)
   Also adds live unit and integration tests for slurm adapter

---------

Co-authored-by: Francesco Di Natale <frank.dinatale1988@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bruno P. Kinoshita <kinow@users.noreply.github.com>
Co-authored-by: Charles Doutriaux <doutriaux1@llnl.gov>
Co-authored-by: Giovanni Rosa <grosa23@yahoo.com>
Co-authored-by: Brian Gunnarson <49216024+bgunnar5@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Adapters Items that are directly related to Maestro's adapter structure. Bugfix Discussion/Implementation of a solution to a bug (usually a PR)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants