From 490829c8eaf14f41de978ac0f93ecda3df8bcdef Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Tue, 9 Jul 2019 15:03:24 +1000 Subject: [PATCH] osd: Modify lazy omap stats to only show one copy Only show stats from the primary to get more in line with other pg stats representations. Signed-off-by: Brad Hubbard --- src/osd/PGBackend.cc | 4 ++++ src/test/lazy-omap-stats/CMakeLists.txt | 2 +- .../{lazy-omap-stats-test.cc => lazy_omap_stats_test.cc} | 2 +- .../{lazy-omap-stats-test.h => lazy_omap_stats_test.h} | 0 src/test/lazy-omap-stats/main.cc | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) rename src/test/lazy-omap-stats/{lazy-omap-stats-test.cc => lazy_omap_stats_test.cc} (99%) rename src/test/lazy-omap-stats/{lazy-omap-stats-test.h => lazy_omap_stats_test.h} (100%) diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc index fa802d3a7c1..afde1517b1c 100644 --- a/src/osd/PGBackend.cc +++ b/src/osd/PGBackend.cc @@ -1247,6 +1247,10 @@ void PGBackend::be_omap_checks(const map &maps, // Iterate through objects and update omap stats for (const auto& k : master_set) { for (const auto& map : maps) { + if (map.first != get_parent()->primary_shard()) { + // Only set omap stats for the primary + continue; + } auto it = map.second->objects.find(k); if (it == map.second->objects.end()) continue; diff --git a/src/test/lazy-omap-stats/CMakeLists.txt b/src/test/lazy-omap-stats/CMakeLists.txt index 2d2fd0957e4..fad71f135ce 100644 --- a/src/test/lazy-omap-stats/CMakeLists.txt +++ b/src/test/lazy-omap-stats/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(ceph_test_lazy_omap_stats main.cc - lazy-omap-stats-test.cc) + lazy_omap_stats_test.cc) target_link_libraries(ceph_test_lazy_omap_stats librados ${UNITTEST_LIBS} Boost::system) install(TARGETS diff --git a/src/test/lazy-omap-stats/lazy-omap-stats-test.cc b/src/test/lazy-omap-stats/lazy_omap_stats_test.cc similarity index 99% rename from src/test/lazy-omap-stats/lazy-omap-stats-test.cc rename to src/test/lazy-omap-stats/lazy_omap_stats_test.cc index 6d78926bcec..dd461429f30 100644 --- a/src/test/lazy-omap-stats/lazy-omap-stats-test.cc +++ b/src/test/lazy-omap-stats/lazy_omap_stats_test.cc @@ -25,7 +25,7 @@ #include #include -#include "lazy-omap-stats-test.h" +#include "lazy_omap_stats_test.h" using namespace std; namespace bp = boost::process; diff --git a/src/test/lazy-omap-stats/lazy-omap-stats-test.h b/src/test/lazy-omap-stats/lazy_omap_stats_test.h similarity index 100% rename from src/test/lazy-omap-stats/lazy-omap-stats-test.h rename to src/test/lazy-omap-stats/lazy_omap_stats_test.h diff --git a/src/test/lazy-omap-stats/main.cc b/src/test/lazy-omap-stats/main.cc index 2c71394e5af..d379e8fbd26 100644 --- a/src/test/lazy-omap-stats/main.cc +++ b/src/test/lazy-omap-stats/main.cc @@ -12,7 +12,7 @@ * */ -#include "lazy-omap-stats-test.h" +#include "lazy_omap_stats_test.h" int main(const int argc, const char** argv) { -- 2.39.5