From a1156c922a470f05052fe63236eb82324d57b54e Mon Sep 17 00:00:00 2001 From: Prashant D Date: Fri, 29 Oct 2021 09:09:24 -0400 Subject: [PATCH] osd/OSD: Log aggregated slow ops detail to cluster logs Slow requests can overwhelm a cluster log with every slow op in detail and also fills up the monitor db. Instead, log slow ops details in aggregated format. Fixes: https://tracker.ceph.com/issues/52424 Signed-off-by: Prashant D (cherry picked from commit 9319dc9273b36dc4f4bef1261b3c57690336a8cc) Conflicts: src/common/options/osd.yaml.in: Removed osd.yaml.in as pacific release does not support options in yaml format. Added new config 'osd_aggregated_slow_ops_logging' to common/options. --- src/common/legacy_config_opts.h | 1 + src/common/options.cc | 4 +++ src/osd/OSD.cc | 49 ++++++++++++++++++++++++++++++++- src/osd/OpRequest.h | 29 +++++++++++++++++++ 4 files changed, 82 insertions(+), 1 deletion(-) diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h index d22061f8a7d5..d6ed3a30f031 100644 --- a/src/common/legacy_config_opts.h +++ b/src/common/legacy_config_opts.h @@ -606,6 +606,7 @@ OPTION(osd_max_markdown_count, OPT_INT) OPTION(osd_op_pq_max_tokens_per_priority, OPT_U64) OPTION(osd_op_pq_min_cost, OPT_U64) OPTION(osd_recover_clone_overlap, OPT_BOOL) // preserve clone_overlap during recovery/migration +OPTION(osd_aggregated_slow_ops_logging, OPT_BOOL) OPTION(osd_op_num_threads_per_shard, OPT_INT) OPTION(osd_op_num_threads_per_shard_hdd, OPT_INT) OPTION(osd_op_num_threads_per_shard_ssd, OPT_INT) diff --git a/src/common/options.cc b/src/common/options.cc index a5d22fb63850..630da07e9b5c 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -2975,6 +2975,10 @@ std::vector