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

DM-38601: Fix checkExistingOutputs method to clobber complete outputs #229

Merged
merged 2 commits into from Apr 10, 2023

Conversation

andy-slac
Copy link
Collaborator

@andy-slac andy-slac commented Apr 6, 2023

The logic in the method has been improved to handle the case when
clobberOutputs was specified without skipExistingIn. It now correctly
removes complete quantum outputs. Added test cases for this behavior.

Checklist

  • ran Jenkins
  • added a release note for user-visible changes to doc/changes

@@ -423,7 +423,7 @@ def makeWriteButler(cls, args: SimpleNamespace, taskDefs: Optional[Iterable[Task
# collection from its chain collection first.
with butler.transaction():
butler.registry.setCollectionChain(self.output.name, chainDefinition, flatten=True)
butler.pruneCollection(replaced, purge=True, unstore=True)
butler.removeRuns([replaced], unstore=True)
Copy link
Member

Choose a reason for hiding this comment

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

I'm confused. Didn't I already do that in d712735 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hmm, did I forgot to pull it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

My fault, indeed, was branching off of old "main".

@codecov
Copy link

codecov bot commented Apr 6, 2023

Codecov Report

Patch coverage: 98.68% and project coverage change: +0.49 🎉

Comparison is base (70ca830) 82.41% compared to head (6aa519c) 82.90%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #229      +/-   ##
==========================================
+ Coverage   82.41%   82.90%   +0.49%     
==========================================
  Files          46       46              
  Lines        4037     4113      +76     
  Branches      769      770       +1     
==========================================
+ Hits         3327     3410      +83     
+ Misses        526      521       -5     
+ Partials      184      182       -2     
Impacted Files Coverage Δ
python/lsst/ctrl/mpexec/singleQuantumExecutor.py 69.84% <75.00%> (+0.46%) ⬆️
tests/test_executors.py 92.43% <100.00%> (+1.61%) ⬆️

... and 2 files 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.

The logic in the method has been improved to handle the case when
clobberOutputs was specified without skipExistingIn. It now correctly
removes complete quantum outputs. Added test cases for this behavior.
@andy-slac andy-slac merged commit dd9b229 into main Apr 10, 2023
11 checks passed
@andy-slac andy-slac deleted the tickets/DM-38601 branch April 10, 2023 20:01
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.

None yet

2 participants