From: Laura Flores <lflores@redhat.com>
Date: Mon, 30 Sep 2024 21:29:38 +0000 (-0500)
Subject: Merge pull request #52636 from baergj/subsecond-history-slow-op-upstream
X-Git-Tag: testing/wip-rishabh-testing-20241001.141349~11
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=aa6b09b196da8d31f16c74aa25c225e5a49fbef5;p=ceph-ci.git

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

TrackedOp: Make history_slow_op_threshold a float
---

aa6b09b196da8d31f16c74aa25c225e5a49fbef5
diff --cc src/common/TrackedOp.cc
index a6467bcaaca,1a3186b9fa0..b888d933480
--- a/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();