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

Disable change of drone_uuid after resource deployment in Moab adapter #292

Merged
merged 4 commits into from
Apr 5, 2023

Conversation

giffels
Copy link
Member

@giffels giffels commented Mar 30, 2023

Currently, the Moab site adapter is changing the drone_uuid after the resource has been deployed to name-<moab_job_id>. Due to this the SqliteRegistry is not updated anymore (since #247 ), so that TARDIS forgets about deployed resources in case of a restart of the service.

This pull requests removes that feature from the Moab adapter and deploys the standard TardisDrone environments variables in the job environment instead, so that the drone can take care of setting the right attributes to the OBS, so that TARDIS can associate drones to running jobs. In SLURM that is done via a Feature, while on HTCondor it is done via setting a TardisDroneUuid ClassAd. Now the almost all site adapters use the very same mechanism.

Fixes #291.

@giffels giffels added the bug Something isn't working label Mar 30, 2023
@codecov-commenter
Copy link

codecov-commenter commented Mar 31, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (a55ab6a) 98.80% compared to head (2ac6e75) 98.80%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #292   +/-   ##
=======================================
  Coverage   98.80%   98.80%           
=======================================
  Files          56       56           
  Lines        2339     2344    +5     
=======================================
+ Hits         2311     2316    +5     
  Misses         28       28           
Impacted Files Coverage Δ
tardis/adapters/sites/htcondor.py 100.00% <100.00%> (ø)
tardis/adapters/sites/moab.py 100.00% <100.00%> (ø)
tardis/adapters/sites/slurm.py 100.00% <100.00%> (ø)
tardis/utilities/utils.py 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@giffels giffels marked this pull request as ready for review April 3, 2023 07:23
@giffels giffels requested review from a team, maxfischer2781 and eileen-kuehn and removed request for a team April 3, 2023 07:23
Copy link
Member

@maxfischer2781 maxfischer2781 left a comment

Choose a reason for hiding this comment

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

The code changes themselves look good, but I don't get where anything is actually being disabled. I only see additions and refactoring. Can you clarify which part disables the change of drone_uuids?

Copy link
Member

@maxfischer2781 maxfischer2781 left a comment

Choose a reason for hiding this comment

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

Disable it so! 🔋

Copy link
Member

@eileen-kuehn eileen-kuehn 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 to me 👍

@giffels giffels added this pull request to the merge queue Apr 5, 2023
Merged via the queue into MatterMiners:master with commit 40cbedf Apr 5, 2023
@giffels giffels deleted the fix-moab-adapter branch April 5, 2023 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

no ResourceState from SQLiteRegistry db after service crash/restart
4 participants