Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

squid: osd/scrub: no "slow response" warning for queued reservations #56482

Merged
merged 2 commits into from
Apr 18, 2024
Merged

squid: osd/scrub: no "slow response" warning for queued reservations #56482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab385a2
osd/scrub: no "slow response" warning for queued reservations
ronen-fr Mar 20, 2024
ceb3d26
osd/scrub: removing the slow reservation response configuration option
ronen-fr Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 0 additions & 13 deletions src/common/options/osd.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,17 +520,6 @@ options:
stats (inc. scrub/block duration) every this many seconds.
default: 120
with_legacy: false
- name: osd_scrub_slow_reservation_response
type: millisecs
level: advanced
desc: Maximum wait (milliseconds) for scrub reservations before issuing a cluster-log warning
long_desc: Waiting too long for a replica to respond to scrub resource reservation request.
Disable by setting to a very large value.
default: 30000
min: 500
see_also:
- osd_scrub_reservation_timeout
with_legacy: false
- name: osd_scrub_reservation_timeout
type: millisecs
level: advanced
Expand All @@ -540,8 +529,6 @@ options:
to a very large value.
default: 300000
min: 2000
see_also:
- osd_scrub_slow_reservation_response
with_legacy: false
- name: osd_scrub_disable_reservation_queuing
type: bool
Expand Down
16 changes: 1 addition & 15 deletions src/osd/scrubber/scrub_reservations.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,9 @@ ReplicaReservations::ReplicaReservations(
dout(10) << "high-priority scrub - no reservations needed" << dendl;
m_perf_set.inc(scrbcnt_resrv_skipped);
} else {
m_process_started_at = ScrubClock::now();

// send out the 1'st request (unless we have no replicas)
m_process_started_at = ScrubClock::now();
send_next_reservation_or_complete();
m_slow_response_warn_timeout =
m_scrubber.get_pg_cct()->_conf.get_val<milliseconds>(
"osd_scrub_slow_reservation_response");
}
}

Expand Down Expand Up @@ -174,16 +170,6 @@ bool ReplicaReservations::handle_reserve_grant(
}

auto elapsed = ScrubClock::now() - m_last_request_sent_at;

// log a warning if the response was slow to arrive
if ((m_slow_response_warn_timeout > 0ms) &&
(elapsed > m_slow_response_warn_timeout)) {
m_osds->clog->warn() << fmt::format(
"slow reservation response from {} ({}ms)", from,
duration_cast<milliseconds>(elapsed).count());
// prevent additional warnings
m_slow_response_warn_timeout = 0ms;
}
dout(10) << fmt::format(
"(e:{} nonce:{}) granted by {} ({} of {}) in {}ms",
msg.map_epoch, msg.reservation_nonce, from,
Expand Down
4 changes: 0 additions & 4 deletions src/osd/scrubber/scrub_reservations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ class ReplicaReservations {
*/
reservation_nonce_t& m_last_request_sent_nonce;

/// the 'slow response' timeout (in milliseconds) - as configured.
/// Doubles as a 'do once' flag for the warning.
std::chrono::milliseconds m_slow_response_warn_timeout;

/// access to the performance counters container relevant to this scrub
/// parameters
PerfCounters& m_perf_set;
Expand Down