Merge pull request #52636 from baergj/subsecond-history-slow-op-upstream

TrackedOp: Make history_slow_op_threshold a float

diff --cc src/common/TrackedOp.cc
index a6467bcaaca7dc581f5c1c486de64d018508e08f,1a3186b9fa002d4159ecc81698c8b3a1c85b42c9..b888d9334808dd54a8d4f1241b3fd8d2a9df0709
--- 1/src/common/TrackedOp.cc
--- 2/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@@ -204,14 -204,17 +204,14 @@@ void OpHistory::dump_slow_ops(utime_t n
    cleanup(now);
    f->open_object_section("OpHistory slow ops");
    f->dump_int("num to keep", history_slow_op_size.load());
-   f->dump_int("threshold to keep", history_slow_op_threshold.load());
+   f->dump_float("threshold to keep", history_slow_op_threshold.load());
    {
      f->open_array_section("Ops");
 -    for (set<pair<utime_t, TrackedOpRef> >::const_iterator i =
 -         slow_op.begin();
 -       i != slow_op.end();
 -       ++i) {
 -      if (!i->second->filter_out(filters))
 +    for ([[maybe_unused]] const auto& [t, op] : slow_op) {
 +      if (!op->filter_out(filters))
          continue;
        f->open_object_section("Op");
 -      i->second->dump(now, f);
 +      op->dump(now, f, OpTracker::default_dumper);
        f->close_section();
      }
      f->close_section();

diff --cc src/common/TrackedOp.h
Simple merge