Skip to content

Commit 5e0bb56

Browse files
authored
Merge pull request ceph#58752 from Matan-B/wip-matanb-replicated-backend-50608
2 parents 98fc589 + 06a5ad4 commit 5e0bb56

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/osd/ReplicatedBackend.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,7 @@ struct C_ReplicatedBackend_OnPullComplete : GenContext<ThreadPool::TPHandle&> {
917917
ceph_assert(j != bc->pulling.end());
918918
ObjectContextRef obc = j->second.obc;
919919
bc->clear_pull(j, false /* already did it */);
920+
ceph_assert(obc);
920921
int started = bc->start_pushes(i.hoid, obc, h);
921922
if (started < 0) {
922923
bc->pushing[i.hoid].clear();
@@ -1932,7 +1933,9 @@ bool ReplicatedBackend::handle_pull_response(
19321933
pull_info.lock_manager);
19331934
}
19341935

1935-
1936+
// if `first` is true, obc was just set above. Otherwise, we should be
1937+
// able to reuse it.
1938+
ceph_assert(pull_info.obc);
19361939
interval_set<uint64_t> usable_intervals;
19371940
bufferlist usable_data;
19381941
trim_pushed_data(pull_info.recovery_info.copy_subset,

0 commit comments

Comments
 (0)