From fc1871295d29b0166123bdfa862bc59d091808c5 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Sun, 27 Oct 2024 13:52:36 +0100
Subject: [PATCH] osd/scrubber: add missing includes

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 src/osd/scrubber/PrimaryLogScrub.cc    | 1 +
 src/osd/scrubber/ScrubStore.cc         | 1 +
 src/osd/scrubber/ScrubStore.h          | 3 +++
 src/osd/scrubber/osd_scrub.cc          | 1 +
 src/osd/scrubber/osd_scrub_sched.cc    | 1 +
 src/osd/scrubber/pg_scrubber.cc        | 2 ++
 src/osd/scrubber/scrub_backend.cc      | 1 +
 src/osd/scrubber/scrub_backend.h       | 1 +
 src/osd/scrubber/scrub_job.cc          | 2 ++
 src/osd/scrubber/scrub_machine.cc      | 4 +++-
 src/osd/scrubber/scrub_reservations.cc | 1 +
 src/osd/scrubber_common.h              | 6 ++++++
 12 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/osd/scrubber/PrimaryLogScrub.cc b/src/osd/scrubber/PrimaryLogScrub.cc
index 74661ab12ee..a932843980b 100644
--- a/src/osd/scrubber/PrimaryLogScrub.cc
+++ b/src/osd/scrubber/PrimaryLogScrub.cc
@@ -5,6 +5,7 @@
 
 #include <sstream>
 
+#include "common/debug.h"
 #include "common/scrub_types.h"
 #include "osd/PeeringState.h"
 #include "osd/PrimaryLogPG.h"
diff --git a/src/osd/scrubber/ScrubStore.cc b/src/osd/scrubber/ScrubStore.cc
index 0360148f7ad..b4b443797b4 100644
--- a/src/osd/scrubber/ScrubStore.cc
+++ b/src/osd/scrubber/ScrubStore.cc
@@ -3,6 +3,7 @@
 
 #include "./ScrubStore.h"
 #include "osd/osd_types.h"
+#include "common/debug.h"
 #include "common/scrub_types.h"
 #include "include/rados/rados_types.hpp"
 
diff --git a/src/osd/scrubber/ScrubStore.h b/src/osd/scrubber/ScrubStore.h
index 0955654d78e..ae95adb66a1 100644
--- a/src/osd/scrubber/ScrubStore.h
+++ b/src/osd/scrubber/ScrubStore.h
@@ -2,6 +2,9 @@
 // vim: ts=8 sw=2 smarttab
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "common/map_cacher.hpp"
 #include "osd/osd_types_fmt.h"
 #include "osd/SnapMapper.h"  // for OSDriver
diff --git a/src/osd/scrubber/osd_scrub.cc b/src/osd/scrubber/osd_scrub.cc
index f80cf04f3e1..2fbe9c38cf1 100644
--- a/src/osd/scrubber/osd_scrub.cc
+++ b/src/osd/scrubber/osd_scrub.cc
@@ -8,6 +8,7 @@
 #include "osdc/Objecter.h"
 
 #include "pg_scrubber.h"
+#include "common/debug.h"
 
 using namespace ::std::chrono;
 using namespace ::std::chrono_literals;
diff --git a/src/osd/scrubber/osd_scrub_sched.cc b/src/osd/scrubber/osd_scrub_sched.cc
index a45c817b38b..5b524139e04 100644
--- a/src/osd/scrubber/osd_scrub_sched.cc
+++ b/src/osd/scrubber/osd_scrub_sched.cc
@@ -6,6 +6,7 @@
 #include "osd/OSD.h"
 
 #include "pg_scrubber.h"
+#include "common/debug.h"
 
 using namespace ::std::chrono;
 using namespace ::std::chrono_literals;
diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index 0a218098f88..36f7ce5fb6c 100644
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -8,11 +8,13 @@
 #include <cmath>
 #include <iostream>
 #include <span>
+#include <sstream>
 #include <vector>
 
 #include "debug.h"
 
 #include "common/ceph_time.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include "messages/MOSDOp.h"
 #include "messages/MOSDRepScrub.h"
diff --git a/src/osd/scrubber/scrub_backend.cc b/src/osd/scrubber/scrub_backend.cc
index 613c9a28782..1f592a28ae9 100644
--- a/src/osd/scrubber/scrub_backend.cc
+++ b/src/osd/scrubber/scrub_backend.cc
@@ -4,6 +4,7 @@
 #include "./scrub_backend.h"
 
 #include <algorithm>
+#include <sstream>
 
 #include <fmt/ranges.h>
 
diff --git a/src/osd/scrubber/scrub_backend.h b/src/osd/scrubber/scrub_backend.h
index 1755d6a8246..b42f416e8e7 100644
--- a/src/osd/scrubber/scrub_backend.h
+++ b/src/osd/scrubber/scrub_backend.h
@@ -43,6 +43,7 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 
+#include <iosfwd>
 #include <string_view>
 
 #include "common/LogClient.h"
diff --git a/src/osd/scrubber/scrub_job.cc b/src/osd/scrubber/scrub_job.cc
index 43b89949633..755978b083e 100644
--- a/src/osd/scrubber/scrub_job.cc
+++ b/src/osd/scrubber/scrub_job.cc
@@ -5,6 +5,8 @@
 
 #include "pg_scrubber.h"
 
+#include "common/debug.h"
+
 using must_scrub_t = Scrub::must_scrub_t;
 using sched_params_t = Scrub::sched_params_t;
 using OSDRestrictions = Scrub::OSDRestrictions;
diff --git a/src/osd/scrubber/scrub_machine.cc b/src/osd/scrubber/scrub_machine.cc
index 10866ce580a..b72cf03eec3 100644
--- a/src/osd/scrubber/scrub_machine.cc
+++ b/src/osd/scrubber/scrub_machine.cc
@@ -1,6 +1,8 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include "scrub_machine.h"
+
 #include <chrono>
 #include <typeinfo>
 
@@ -10,7 +12,7 @@
 #include "osd/OpRequest.h"
 
 #include "ScrubStore.h"
-#include "scrub_machine.h"
+#include "common/debug.h"
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_osd
diff --git a/src/osd/scrubber/scrub_reservations.cc b/src/osd/scrubber/scrub_reservations.cc
index fb9593597e9..0b3265dde4d 100644
--- a/src/osd/scrubber/scrub_reservations.cc
+++ b/src/osd/scrubber/scrub_reservations.cc
@@ -6,6 +6,7 @@
 #include <span>
 
 #include "common/ceph_time.h"
+#include "common/debug.h"
 #include "osd/OSD.h"
 #include "osd/PG.h"
 #include "osd/osd_types_fmt.h"
diff --git a/src/osd/scrubber_common.h b/src/osd/scrubber_common.h
index 14a09fc79db..edbc9599851 100644
--- a/src/osd/scrubber_common.h
+++ b/src/osd/scrubber_common.h
@@ -2,10 +2,16 @@
 // vim: ts=8 sw=2 smarttab
 #pragma once
 
+#include <iosfwd>
+#include <set>
+#include <string>
+#include <string_view>
+
 #include <fmt/ranges.h>
 #include "common/ceph_time.h"
 #include "common/fmt_common.h"
 #include "common/scrub_types.h"
+#include "include/random.h" // for ceph::util::generate_random_number()
 #include "include/types.h"
 #include "messages/MOSDScrubReserve.h"
 #include "os/ObjectStore.h"
-- 
2.39.5