osd/scrub: collecting scrub-related files into a separate directory

Cleaning src/osd from scrub implementation files. Triggered by:
- the matching Crimson scrub structure;
- the proliferation of scrub related code files (inc. in coming PRs);

scrubber_common.h, which defines the scrubber's interface, remains
in src/osd.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index fa109e257cc6b7e6432d07c343de3da5aa5ea4bd..28e4ddb6b3071975f29212d363f3ef4cb9481deb 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -20,10 +20,10 @@
 #include "common/config.h"
 #include "OSD.h"
 #include "OpRequest.h"
-#include "scrubber/ScrubStore.h"
-#include "scrubber/pg_scrubber.h"
-#include "Session.h"
+#include "osd/scrubber/ScrubStore.h"
+#include "osd/scrubber/pg_scrubber.h"
 #include "osd/scheduler/OpSchedulerItem.h"
+#include "Session.h"
 
 #include "common/Timer.h"
 #include "common/perf_counters.h"

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index cca28a8941d3b3cd7fc8ceffb20deb0407183ef6..9ae6b2c14e5c2670dcffbf70984cc9fbdda801c6 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -19,7 +19,7 @@
 #include "common/errno.h"
 #include "common/scrub_types.h"
 #include "ReplicatedBackend.h"
-#include "scrubber/ScrubStore.h"
+#include "osd/scrubber/ScrubStore.h"
 #include "ECBackend.h"
 #include "PGBackend.h"
 #include "OSD.h"

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 0e318c12c85b62c29b32135ffd29ead3167e9527..9d700e23b40c2cc31d4856b00b93b42562b3672b 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -25,6 +25,8 @@
 #include <boost/intrusive_ptr.hpp>
 #include <boost/tuple/tuple.hpp>
 
+#include "PrimaryLogPG.h"
+
 #include "cls/cas/cls_cas_ops.h"
 #include "common/CDC.h"
 #include "common/EventTrace.h"
@@ -52,9 +54,9 @@
 #include "objclass/objclass.h"
 #include "osd/ClassHandler.h"
 #include "osdc/Objecter.h"
-#include "scrubber/PrimaryLogScrub.h"
-#include "scrubber/ScrubStore.h"
-#include "scrubber/pg_scrubber.h"
+#include "osd/scrubber/PrimaryLogScrub.h"
+#include "osd/scrubber/ScrubStore.h"
+#include "osd/scrubber/pg_scrubber.h"
 
 #include "OSD.h"
 #include "OpRequest.h"