summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam C. Emerson <aemerson@redhat.com>2020-11-30 21:57:02 +0100
committerAdam C. Emerson <aemerson@redhat.com>2021-01-21 23:17:39 +0100
commit78ece45796b52c6a6cc24b88461c9b277e6e7396 (patch)
tree6e1a1a1dfe39c9d07332317bfb35cba40351839c
parentMerge pull request #38988 from orozery/librbd-crypto-empty-copyup (diff)
downloadceph-78ece45796b52c6a6cc24b88461c9b277e6e7396.tar.xz
ceph-78ece45796b52c6a6cc24b88461c9b277e6e7396.zip
rgw: Since we aren't using these anyway
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
-rw-r--r--src/rgw/services/svc_datalog_rados.cc83
-rw-r--r--src/rgw/services/svc_datalog_rados.h70
2 files changed, 0 insertions, 153 deletions
diff --git a/src/rgw/services/svc_datalog_rados.cc b/src/rgw/services/svc_datalog_rados.cc
deleted file mode 100644
index e3274d3f0cc..00000000000
--- a/src/rgw/services/svc_datalog_rados.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab ft=cpp
-
-#include "svc_datalog_rados.h"
-#include "svc_zone.h"
-#include "svc_cls.h"
-
-#include "rgw/rgw_bucket.h"
-
-
-#define dout_subsys ceph_subsys_rgw
-
-RGWSI_DataLog_RADOS::RGWSI_DataLog_RADOS(CephContext *cct) : RGWServiceInstance(cct) {
-}
-
-RGWSI_DataLog_RADOS::~RGWSI_DataLog_RADOS() {
-}
-
-int RGWSI_DataLog_RADOS::init(RGWSI_Zone *_zone_svc, RGWSI_Cls *_cls_svc)
-{
- svc.zone = _zone_svc;
- svc.cls = _cls_svc;
-
- return 0;
-}
-
-int RGWSI_DataLog_RADOS::do_start()
-{
- log.reset(new RGWDataChangesLog(svc.zone, svc.cls));
-
- return 0;
-}
-
-void RGWSI_DataLog_RADOS::shutdown()
-{
- log.reset();
-}
-
-void RGWSI_DataLog_RADOS::set_observer(rgw::BucketChangeObserver *observer)
-{
- log->set_observer(observer);
-}
-
-int RGWSI_DataLog_RADOS::get_log_shard_id(rgw_bucket& bucket, int shard_id)
-{
- return log->get_log_shard_id(bucket, shard_id);
-}
-
-std::string RGWSI_DataLog_RADOS::get_oid(int shard_id) const
-{
- return log->get_oid(shard_id);
-}
-
-int RGWSI_DataLog_RADOS::get_info(int shard_id, RGWDataChangesLogInfo *info)
-{
- return log->get_info(shard_id, info);
-}
-
-int RGWSI_DataLog_RADOS::add_entry(const RGWBucketInfo& bucket_info, int shard_id)
-{
- return log->add_entry(bucket_info, shard_id);
-}
-
-int RGWSI_DataLog_RADOS::list_entries(int shard, int max_entries,
- std::vector<rgw_data_change_log_entry>& entries,
- std::optional<std::string_view> marker,
- std::string* out_marker,
- bool* truncated)
-{
- return log->list_entries(shard, max_entries,
- entries, marker, out_marker, truncated);
-}
-
-int RGWSI_DataLog_RADOS::list_entries(int max_entries,
- std::vector<rgw_data_change_log_entry>& entries, RGWDataChangesLogMarker& marker, bool *ptruncated)
-{
- return log->list_entries(max_entries, entries, marker, ptruncated);
-}
-
-int RGWSI_DataLog_RADOS::trim_entries(int shard_id, std::string_view marker)
-{
- return log->trim_entries(shard_id, marker);
-}
diff --git a/src/rgw/services/svc_datalog_rados.h b/src/rgw/services/svc_datalog_rados.h
deleted file mode 100644
index 78a6860fad4..00000000000
--- a/src/rgw/services/svc_datalog_rados.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab ft=cpp
-
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2019 Red Hat, Inc.
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software
- * Foundation. See file COPYING.
- *
- */
-
-
-#pragma once
-
-#include "rgw/rgw_service.h"
-
-
-class RGWDataChangesLog;
-class RGWDataChangesLogInfo;
-struct RGWDataChangesLogMarker;
-struct rgw_data_change_log_entry;
-
-namespace rgw {
- class BucketChangeObserver;
-}
-
-class RGWSI_DataLog_RADOS : public RGWServiceInstance
-{
- std::unique_ptr<RGWDataChangesLog> log;
-
-public:
- RGWSI_DataLog_RADOS(CephContext *cct);
- virtual ~RGWSI_DataLog_RADOS();
-
- struct Svc {
- RGWSI_Zone *zone{nullptr};
- RGWSI_Cls *cls{nullptr};
- } svc;
-
- int init(RGWSI_Zone *_zone_svc,
- RGWSI_Cls *_cls_svc);
-
- int do_start() override;
- void shutdown() override;
-
- RGWDataChangesLog *get_log() {
- return log.get();
- }
-
- void set_observer(rgw::BucketChangeObserver *observer);
-
- int get_log_shard_id(rgw_bucket& bucket, int shard_id);
- std::string get_oid(int shard_id) const;
-
- int get_info(int shard_id, RGWDataChangesLogInfo *info);
-
- int add_entry(const RGWBucketInfo& bucket_info, int shard_id);
- int list_entries(int shard, int max_entries,
- std::vector<rgw_data_change_log_entry>& entries,
- std::optional<std::string_view> marker,
- std::string* out_marker, bool* truncated);
- int list_entries(int max_entries,
- std::vector<rgw_data_change_log_entry>& entries,
- RGWDataChangesLogMarker& marker, bool *ptruncated);
- int trim_entries(int shard_id, std::string_view marker);
-};