Skip to content

Commit 1e7a753

Browse files
committed
Merge PR ceph#58125 into main
* refs/pull/58125/head: common/TrackedOp: do not count the ops marked as nowarn Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Venky Shankar <[email protected]>
2 parents 0efe88d + 8debaf5 commit 1e7a753

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/common/TrackedOp.cc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,12 +339,15 @@ bool OpTracker::visit_ops_in_flight(utime_t* oldest_secs,
339339
for (const auto sdata : sharded_in_flight_list) {
340340
ceph_assert(sdata);
341341
std::lock_guard locker(sdata->ops_in_flight_lock_sharded);
342-
if (!sdata->ops_in_flight_sharded.empty()) {
343-
utime_t oldest_op_tmp =
344-
sdata->ops_in_flight_sharded.front().get_initiated();
342+
for (auto& op : sdata->ops_in_flight_sharded) {
343+
if (!op.warn_interval_multiplier || op.is_continuous())
344+
continue;
345+
346+
utime_t oldest_op_tmp = op.get_initiated();
345347
if (oldest_op_tmp < oldest_op) {
346348
oldest_op = oldest_op_tmp;
347349
}
350+
break;
348351
}
349352
std::transform(std::begin(sdata->ops_in_flight_sharded),
350353
std::end(sdata->ops_in_flight_sharded),

0 commit comments

Comments
 (0)