From cf5222df77439dafa7810323033c07b16217a67c Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Mon, 30 Sep 2019 09:31:10 +1000 Subject: [PATCH] osd/PG: Add PG to large omap log message Fixes: https://tracker.ceph.com/issues/41359 Signed-off-by: Brad Hubbard (cherry picked from commit a71d51bfa154a278a350e6dbeb842fb3585b74f5) --- src/osd/PGBackend.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc index 90c5d8af643..a15042ae127 100644 --- a/src/osd/PGBackend.cc +++ b/src/osd/PGBackend.cc @@ -1286,10 +1286,16 @@ void PGBackend::be_omap_checks(const map &maps, omap_stats.omap_bytes += obj.object_omap_bytes; omap_stats.omap_keys += obj.object_omap_keys; if (obj.large_omap_object_found) { + pg_t pg; + auto osdmap = get_osdmap(); + osdmap->map_to_pg(k.pool, k.oid.name, k.get_key(), k.nspace, &pg); + pg_t mpg = osdmap->raw_pg_to_pg(pg); omap_stats.large_omap_objects++; - warnstream << "Large omap object found. Object: " << k << " Key count: " - << obj.large_omap_object_key_count << " Size (bytes): " - << obj.large_omap_object_value_size << '\n'; + warnstream << "Large omap object found. Object: " << k + << " PG: " << pg << " (" << mpg << ")" + << " Key count: " << obj.large_omap_object_key_count + << " Size (bytes): " << obj.large_omap_object_value_size + << '\n'; break; } } -- 2.47.3