Punch through the storage.objstorage "collaborator" to get to the actual objstorages
This change introduced subtly confusing behavior, where the storage.objstorage
getattr proxy hides itself, until you try a dunder method (e.g. foo in storage.objstorage
or iter(storage.objstorage)
), blows up in your face with a
confusing exception (because the collaborator is also called ObjStorage).
Using the underlying objstorage works around that issue.
Test Plan
tox output is unchanged
Migrated from D2749 (view on Phabricator)