DM-39198: fix storage class handling in datastore, as used by QuantumBackedButler #838
Conversation
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #838 +/- ##
=======================================
Coverage 87.73% 87.73%
=======================================
Files 268 268
Lines 35352 35354 +2
Branches 7440 7442 +2
=======================================
+ Hits 31016 31018 +2
Misses 3169 3169
Partials 1167 1167
☔ View full report in Codecov by Sentry. |
| # Make a mapping from refs with the internal storage class to the given | ||
| # refs that may have a different one. We'll use the internal refs | ||
| # throughout this method and convert back at the very end. | ||
| internal_ref_to_input_ref = {self._cast_storage_class(ref): ref for ref in refs} |
There was a problem hiding this comment.
This is needed because the graph doesn't include datastore records and so we are in "trustGetRequest" mode in QBB execution and so we have to determine the output file name and therefore need the correct storage class to find the correct template/file extension?
There was a problem hiding this comment.
In the particular QBB context, yes, and I think in execution butler too (which is weird, but maybe historical and irrelevant). But I can't claim I've made sense of it all; it seems like sometimes we're expecting butler to guarantee that certain refs passed to Datastore already use the registry storage class, and in other cases we're expecting Datastore to fix them itself via the callback passed to set_retrieve_dataset_type_method. What I've tried to do here is just be super defensive so the Datastore can handle what's thrown at it, and I bet that means we've got a few code paths where we ensure we've got the registry storage class on the same ref multiple times.
I really think the right fix is to make Butler.datastore private (which means giving ctrl_mpexec an alternative to calling butler.datastore.mexists) and then rework the Datastore API so it always gets registry storage classes in one argument and overrides in another argument, with the butler (either full or QBB) making sure those method are called correctly. It'd also help a lot to modify Datastore APIs that really only need the dataset ID or ID + component (not the full ref) to take just that.
There was a problem hiding this comment.
It didn't used to matter because this was always getting refs that came from Registry because graphs used unresolved refs and butler.put used unresolved refs. Now that everything is resolved and there is no guarantee Registry even knows about it things are a bit more exciting.
TallJimbo
force-pushed
the
tickets/DM-39198
branch
from
a4daa98
to
412971c
Compare
Checklist
doc/changes