rgw: make subclass dependencies explicit

As part of the Zipper project generic back-end code is being teased
apart from rados-specific back-end code. This is a work in progress,
so currently generic code and other subclasses of StoreDriver (and
related high-level classes) depend on the rados-specific declarations.
Some of these dependencies are not always obvious since
src/rgw/driver/rados was put on the include path. That is now removed,
so any includes needing files from that subclass have to give a more
fully specified path.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 9b55081dbaaad965403a7f480c08f0c77be97786..ddd9be20d2df100ea7aedbbd713d5d7b2c7d9f21 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -287,7 +287,6 @@ target_link_libraries(rgw_common
     ${FMT_LIB})
 target_include_directories(rgw_common
   PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/services"
-  PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/driver/rados"
   PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw"
   PUBLIC "${LUA_INCLUDE_DIR}")
 

diff --git a/src/rgw/driver/dbstore/common/dbstore.h b/src/rgw/driver/dbstore/common/dbstore.h
index 79f312cb844675d9cd6130b33289657de37ca253..d3bdf88053817cc2aa2e152fcb41bbd88cd46075 100644 (file)
--- a/src/rgw/driver/dbstore/common/dbstore.h
+++ b/src/rgw/driver/dbstore/common/dbstore.h
@@ -18,9 +18,10 @@
 #include "global/global_context.h"
 #include "global/global_init.h"
 #include "common/ceph_context.h"
-#include "rgw_obj_manifest.h"
 #include "rgw_multi.h"
 
+#include "driver/rados/rgw_obj_manifest.h" // FIXME: subclass dependency
+
 namespace rgw { namespace store {
 
 class DB;

diff --git a/src/rgw/driver/dbstore/config/sqlite.cc b/src/rgw/driver/dbstore/config/sqlite.cc
index 1f759c69178e9c732ef4ee79a262e85b7535c129..aa2d1a354ffcf6914c95ca307842950b5e0a1100 100644 (file)
--- a/src/rgw/driver/dbstore/config/sqlite.cc
+++ b/src/rgw/driver/dbstore/config/sqlite.cc
@@ -25,7 +25,8 @@
 #include "include/encoding.h"
 #include "common/dout.h"
 #include "common/random_string.h"
-#include "rgw_zone.h"
+
+#include "driver/rados/rgw_zone.h" // FIXME: subclass dependency
 
 #include "common/connection_pool.h"
 #include "sqlite/connection.h"

diff --git a/src/rgw/rgw_basic_types.h b/src/rgw/rgw_basic_types.h
index cd30d2344bad699afc15737bb3aedd1cda52c22b..4cffb333288ea883ac475c4d51fde02c81ba0610 100644 (file)
--- a/src/rgw/rgw_basic_types.h
+++ b/src/rgw/rgw_basic_types.h
@@ -31,7 +31,8 @@
 #include "rgw_user_types.h"
 #include "rgw_bucket_types.h"
 #include "rgw_obj_types.h"
-#include "rgw_obj_manifest.h"
+
+#include "driver/rados/rgw_obj_manifest.h" // FIXME: subclass dependency
 
 #include "common/Formatter.h"
 

diff --git a/src/rgw/rgw_multi.h b/src/rgw/rgw_multi.h
index f57c90e7489569662b8c8c5cc91e37bd044cb634..06a192fc72d82b24ab2a469b7803380065839c08 100644 (file)
--- a/src/rgw/rgw_multi.h
+++ b/src/rgw/rgw_multi.h
@@ -6,11 +6,12 @@
 #include <map>
 #include "rgw_xml.h"
 #include "rgw_obj_types.h"
-#include "rgw_obj_manifest.h"
 #include "rgw_compression_types.h"
 #include "common/dout.h"
 #include "rgw_sal_fwd.h"
 
+#include "driver/rados/rgw_obj_manifest.h" // FIXME: subclass dependency
+
 #define MULTIPART_UPLOAD_ID_PREFIX_LEGACY "2/"
 #define MULTIPART_UPLOAD_ID_PREFIX "2~" // must contain a unique char that may not come up in gen_rand_alpha()
 

diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h
index b222fcd03cbc9ca7d192dd096151b84fe35ec888..9e047ad04b43c7adf7995de64505f2d6c1c58c69 100644 (file)
--- a/src/rgw/rgw_sal.h
+++ b/src/rgw/rgw_sal.h
@@ -18,12 +18,14 @@
 #include "common/tracer.h"
 #include "rgw_sal_fwd.h"
 #include "rgw_lua.h"
-#include "rgw_user.h"
 #include "rgw_notify_event_type.h"
 #include "rgw_req_context.h"
-#include "rgw_datalog_notify.h"
 #include "include/random.h"
 
+// FIXME: following subclass dependencies
+#include "driver/rados/rgw_user.h"
+#include "driver/rados/rgw_datalog_notify.h"
+
 struct RGWBucketEnt;
 class RGWRESTMgr;
 class RGWAccessListFilter;

diff --git a/src/rgw/services/svc_bucket_sync.h b/src/rgw/services/svc_bucket_sync.h
index 7975e062bb6fa298d9088c764f5422110f978c25..37dada55ecd83bfedd7a64f7fa3971afb1d4da81 100644 (file)
--- a/src/rgw/services/svc_bucket_sync.h
+++ b/src/rgw/services/svc_bucket_sync.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "rgw_service.h"
+#include "driver/rados/rgw_service.h" // FIXME: subclass dependency
 
 #include "svc_bucket_types.h"
 

diff --git a/src/rgw/services/svc_mdlog.cc b/src/rgw/services/svc_mdlog.cc
index 06459f5239ea4205f88fa9f24e91adb87fcd58e9..da723f3e1295dd8df95eaf796b3cdea3a7f86e2d 100644 (file)
--- a/src/rgw/services/svc_mdlog.cc
+++ b/src/rgw/services/svc_mdlog.cc
@@ -10,7 +10,8 @@
 #include "rgw_mdlog.h"
 #include "rgw_coroutine.h"
 #include "rgw_cr_rados.h"
-#include "rgw_zone.h"
+
+#include "driver/rados/rgw_zone.h" // FIXME: subclass dependency
 
 #include "common/errno.h"
 

diff --git a/src/rgw/services/svc_meta_be.h b/src/rgw/services/svc_meta_be.h
index 97267a4e7e3ef44ba4d73aa8c8e9ff7a433209ce..b580d173f2203ff3d4de00f994e3c6c8ba6e222a 100644 (file)
--- a/src/rgw/services/svc_meta_be.h
+++ b/src/rgw/services/svc_meta_be.h
@@ -19,9 +19,10 @@
 
 #include "svc_meta_be_params.h"
 
-#include "rgw_service.h"
 #include "rgw_mdlog_types.h"
 
+#include "driver/rados/rgw_service.h" // FIXME: subclass dependency
+
 class RGWMetadataLogData;
 
 class RGWSI_MDLog;

diff --git a/src/rgw/services/svc_user_rados.h b/src/rgw/services/svc_user_rados.h
index 177f720d6b18bc0643576b0f39bdacb3496d8653..4712d1fdafd4108ef50b50d017b467e0dc9f2d8c 100644 (file)
--- a/src/rgw/services/svc_user_rados.h
+++ b/src/rgw/services/svc_user_rados.h
@@ -20,7 +20,8 @@
 
 #include "svc_meta_be.h"
 #include "svc_user.h"
-#include "rgw_bucket.h"
+
+#include "driver/rados/rgw_bucket.h" // FIXME: subclass dependency
 
 class RGWSI_RADOS;
 class RGWSI_Zone;