Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
os/filestore: fix merge_collection replay guards
The guards are based on spos, which does not change across the call to _merge_collection, which means we can't open and close multiple guards within this call. Instead, use a single set of set_guards and closes surrounding both the collection and temp. Also, remove the conditional guard around _remove_collection, which we want to (try to) do (again) as long as we didn't complete our global replay guard. Fixes: http://tracker.ceph.com/issues/36610 Signed-off-by: Sage Weil <sage@redhat.com>
- Loading branch information
Showing
1 changed file
with
16 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters