Skip to content

Commit f128475

Browse files
committed
osd/scrub: verify m_reservations existence
Following clang-tidy's advice. Signed-off-by: Ronen Friedman <[email protected]>
1 parent 163c7b3 commit f128475

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/osd/scrubber/scrub_machine.cc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ sc::result Session::react(const IntervalChanged&)
214214
DECLARE_LOCALS; // 'scrbr' & 'pg_id' aliases
215215
dout(10) << "Session::react(const IntervalChanged&)" << dendl;
216216

217+
ceph_assert(m_reservations);
217218
m_reservations->discard_remote_reservations();
218219
return transit<NotActive>();
219220
}
@@ -267,7 +268,9 @@ sc::result ReservingReplicas::react(const ReplicaGrant& ev)
267268
dout(10) << "ReservingReplicas::react(const ReplicaGrant&)" << dendl;
268269
const auto& m = ev.m_op->get_req<MOSDScrubReserve>();
269270

270-
if (context<Session>().m_reservations->handle_reserve_grant(*m, ev.m_from)) {
271+
auto& session = context<Session>();
272+
ceph_assert(session.m_reservations);
273+
if (session.m_reservations->handle_reserve_grant(*m, ev.m_from)) {
271274
// we are done with the reservation process
272275
return transit<ActiveScrubbing>();
273276
}
@@ -279,6 +282,7 @@ sc::result ReservingReplicas::react(const ReplicaReject& ev)
279282
DECLARE_LOCALS; // 'scrbr' & 'pg_id' aliases
280283
auto& session = context<Session>();
281284
dout(10) << "ReservingReplicas::react(const ReplicaReject&)" << dendl;
285+
ceph_assert(session.m_reservations);
282286
const auto m = ev.m_op->get_req<MOSDScrubReserve>();
283287

284288
// Verify that the message is from the replica we were expecting a reply from,
@@ -306,6 +310,8 @@ sc::result ReservingReplicas::react(const ReservationTimeout&)
306310
DECLARE_LOCALS; // 'scrbr' & 'pg_id' aliases
307311
auto& session = context<Session>();
308312
dout(10) << "ReservingReplicas::react(const ReservationTimeout&)" << dendl;
313+
ceph_assert(session.m_reservations);
314+
309315
session.m_reservations->log_failure_and_duration(scrbcnt_resrv_timed_out);
310316

311317
const auto msg = fmt::format(

src/osd/scrubber/scrub_reservations.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ void ReplicaReservations::discard_remote_reservations()
9898

9999
void ReplicaReservations::log_success_and_duration()
100100
{
101+
ceph_assert(m_process_started_at.has_value());
101102
auto logged_duration = ScrubClock::now() - m_process_started_at.value();
102103
m_perf_set.tinc(scrbcnt_resrv_successful_elapsed, logged_duration);
103104
m_perf_set.inc(scrbcnt_resrv_success);

0 commit comments

Comments
 (0)