Merge pull request ceph#65374 from dang/wip-dang-standalone

RGW - Standalone - Enable building without librados

Author: dang

src/rgw/CMakeLists.txt

@@ -82,7 +82,6 @@ set(librgw_common_srcs
   rgw_period_puller.cc
   rgw_s3_filter.cc
   rgw_pubsub.cc
-  rgw_coroutine.cc
   rgw_cr_rest.cc
   rgw_op.cc
   rgw_policy_s3.cc
@@ -166,7 +165,6 @@ if(WITH_RADOSGW_RADOS)
           services/svc_sys_obj.cc
           services/svc_sys_obj_cache.cc
           services/svc_sys_obj_core.cc
-          services/svc_tier_rados.cc
           services/svc_user.cc
           services/svc_user_rados.cc
           services/svc_zone.cc
@@ -235,7 +233,9 @@ if(WITH_RADOSGW_RADOS)
           driver/rados/rgw_dedup_table.cc
           driver/rados/rgw_dedup_store.cc
           driver/rados/rgw_dedup_utils.cc
-          driver/rados/rgw_dedup_cluster.cc)
+          driver/rados/rgw_dedup_cluster.cc
+	  rgw_coroutine.cc
+	)
 endif()
 if(WITH_RADOSGW_AMQP_ENDPOINT)
   list(APPEND librgw_common_srcs rgw_amqp.cc)
@@ -295,19 +295,7 @@ target_link_libraries(rgw_common
   PRIVATE
     legacy-option-headers
     global
-    cls_2pc_queue_client
-    cls_cmpomap_client
-    cls_lock_client
-    cls_log_client
-    cls_otp_client
-    cls_refcount_client
     cls_rgw_client
-    cls_rgw_gc_client
-    cls_timeindex_client
-    cls_user_client
-    cls_version_client
-    librados
-    libneorados
     rt
     ICU::uc
     OATH::OATH
@@ -367,6 +355,23 @@ if(WITH_JAEGER)
   target_link_libraries(rgw_common PUBLIC jaeger_base)
 endif()
 
+if(WITH_RADOSGW_RADOS)
+  target_link_libraries(rgw_common PRIVATE
+	  cls_2pc_queue_client
+	  cls_cmpomap_client
+	  cls_lock_client
+	  cls_log_client
+	  cls_otp_client
+	  cls_refcount_client
+	  cls_rgw_gc_client
+	  cls_timeindex_client
+	  cls_user_client
+	  cls_version_client
+	  librados
+	  libneorados
+  )
+endif()
+
 if(WITH_RADOSGW_DBSTORE)
   target_link_libraries(rgw_common PRIVATE global dbstore)
 endif()
@@ -405,7 +410,6 @@ set(rgw_a_srcs
   rgw_lua_request.cc
   rgw_opa.cc
   rgw_os_lib.cc
-  rgw_period_pusher.cc
   rgw_process.cc
   rgw_realm_reloader.cc
   rgw_rest_config.cc
@@ -421,9 +425,12 @@ set(rgw_a_srcs
   rgw_sts.cc)
 
 if(WITH_RADOSGW_RADOS)
-  list(APPEND rgw_a_srcs driver/rados/rgw_rest_bucket.cc
+  list(APPEND rgw_a_srcs
+	  driver/rados/rgw_rest_bucket.cc
           driver/rados/rgw_rest_log.cc
-          driver/rados/rgw_rest_realm.cc)
+          driver/rados/rgw_rest_realm.cc
+	  rgw_period_pusher.cc
+  )
 endif()
 
 gperf_generate(${CMAKE_SOURCE_DIR}/src/rgw/rgw_iam_policy_keywords.gperf

src/rgw/rgw_mdlog.h src/rgw/driver/rados/rgw_mdlog.hsrc/rgw/rgw_mdlog.h renamed to src/rgw/driver/rados/rgw_mdlog.h

@@ -58,6 +58,7 @@
 #include "rgw_worker.h"
 #include "rgw_notify.h"
 #include "rgw_http_errors.h"
+#include "rgw_multipart_meta_filter.h"
 
 #undef fork // fails to compile RGWPeriod::fork() below
 

src/rgw/driver/rados/rgw_rados.cc

@@ -70,29 +70,6 @@ struct get_obj_data;
 #define PUT_OBJ_EXCL        0x02
 #define PUT_OBJ_CREATE_EXCL (PUT_OBJ_CREATE | PUT_OBJ_EXCL)
 
-static inline void prepend_bucket_marker(const rgw_bucket& bucket, const std::string& orig_oid, std::string& oid)
-{
-  if (bucket.marker.empty() || orig_oid.empty()) {
-    oid = orig_oid;
-  } else {
-    oid = bucket.marker;
-    oid.append("_");
-    oid.append(orig_oid);
-  }
-}
-
-static inline void get_obj_bucket_and_oid_loc(const rgw_obj& obj, std::string& oid, std::string& locator)
-{
-  const rgw_bucket& bucket = obj.bucket;
-  prepend_bucket_marker(bucket, obj.get_oid(), oid);
-  const std::string& loc = obj.key.get_loc();
-  if (!loc.empty()) {
-    prepend_bucket_marker(bucket, loc, locator);
-  } else {
-    locator.clear();
-  }
-}
-
 struct RGWOLHInfo {
   rgw_obj target;
   bool removed;

src/rgw/driver/rados/rgw_rados.h

@@ -64,6 +64,7 @@
 #include "rgw_tracer.h"
 #include "rgw_zone.h"
 #include "rgw_restore.h"
+#include "rgw_multipart_meta_filter.h"
 
 #include "services/svc_bilog_rados.h"
 #include "services/svc_bi_rados.h"

src/rgw/driver/rados/rgw_sal_rados.cc

@@ -239,6 +239,17 @@ class RGWListRemoteMDLogCR : public RGWShardCollectCR {
   bool spawn_next() override;
 };
 
+RGWRemoteMetaLog::~RGWRemoteMetaLog()
+{
+  delete error_logger;
+}
+
+void RGWRemoteMetaLog::finish()
+{
+  going_down = true;
+  stop();
+}
+
 int RGWRemoteMetaLog::read_log_info(const DoutPrefixProvider *dpp, rgw_mdlog_info *log_info)
 {
   rgw_http_param_pair pairs[] = { { "type", "metadata" },
@@ -298,6 +309,18 @@ int RGWRemoteMetaLog::init()
   return 0;
 }
 
+RGWMetaSyncStatusManager::~RGWMetaSyncStatusManager(){}
+
+std::ostream&  RGWMetaSyncStatusManager::gen_prefix(std::ostream& out) const
+{
+  return out << "meta sync: ";
+}
+
+unsigned RGWMetaSyncStatusManager::get_subsys() const
+{
+  return dout_subsys;
+}
+
 #define CLONE_MAX_ENTRIES 100
 
 int RGWMetaSyncStatusManager::init(const DoutPrefixProvider *dpp)

src/rgw/driver/rados/rgw_sync.cc

@@ -14,6 +14,7 @@
 #include "rgw_aio_throttle.h"
 #include "rgw_asio_thread.h"
 #include "rgw_compression.h"
+#include "services/svc_sys_obj.h"
 
 #define dout_subsys ceph_subsys_rgw
 

src/rgw/driver/rados/rgw_tools.cc

@@ -13,7 +13,7 @@
 
 #include "rgw_acl.h"
 #include "rgw_acl_s3.h"
-#include "rgw_user.h"
+#include "rgw_auth.h"
 
 #define dout_subsys ceph_subsys_rgw
 

src/rgw/rgw_acl.cc

@@ -10,7 +10,7 @@
 #include "common/split.h"
 
 #include "rgw_acl_s3.h"
-#include "rgw_user.h"
+#include "driver/rados/rgw_user.h"
 #include "rgw_sal.h"
 
 #define dout_subsys ceph_subsys_rgw

src/rgw/rgw_acl_s3.cc

@@ -11,7 +11,7 @@
 #include "common/ceph_json.h"
 #include "common/split.h"
 #include "rgw_common.h"
-#include "rgw_user.h"
+#include "driver/rados/rgw_user.h"
 #include "rgw_acl_swift.h"
 #include "rgw_sal.h"