import quincy beta 17.1.0

[ceph.git] / ceph / src / rgw / rgw_rest_log.h

diff --git a/ceph/src/rgw/rgw_rest_log.h b/ceph/src/rgw/rgw_rest_log.h
index ad6abfd73845c49c3d6cb0af66da02278aaa8ca4..9068165b64550145ea39ab281b74feadb860bc06 100644 (file)
--- a/ceph/src/rgw/rgw_rest_log.h
+++ b/ceph/src/rgw/rgw_rest_log.h
@@ -34,7 +34,7 @@ public:
     return check_caps(s->user->get_caps());
   }
   void send_response() override;
-  virtual void send_response(list<rgw_bi_log_entry>& entries, string& marker);
+  virtual void send_response(std::list<rgw_bi_log_entry>& entries, std::string& marker);
   virtual void send_response_end();
   void execute(optional_yield y) override;
   const char* name() const override {
@@ -43,9 +43,9 @@ public:
 };
 
 class RGWOp_BILog_Info : public RGWRESTOp {
-  string bucket_ver;
-  string master_ver;
-  string max_marker;
+  std::string bucket_ver;
+  std::string master_ver;
+  std::string max_marker;
   bool syncstopped;
 public:
   RGWOp_BILog_Info() : bucket_ver(), master_ver(), syncstopped(false) {}
@@ -79,8 +79,8 @@ public:
 };
 
 class RGWOp_MDLog_List : public RGWRESTOp {
-  list<cls_log_entry> entries;
-  string last_marker;
+  std::list<cls_log_entry> entries;
+  std::string last_marker;
   bool truncated;
 public:
   RGWOp_MDLog_List() : truncated(false) {}
@@ -178,6 +178,7 @@ public:
   const char* name() const override {
     return "mdlog_notify";
   }
+  RGWOpType get_type() override { return RGW_OP_SYNC_MDLOG_NOTIFY; }
 };
 
 class RGWOp_MDLog_Delete : public RGWRESTOp {
@@ -266,6 +267,7 @@ public:
   const char* name() const override {
     return "datalog_notify";
   }
+  RGWOpType get_type() override { return RGW_OP_SYNC_DATALOG_NOTIFY; }
 };
 
 class RGWOp_DATALog_Delete : public RGWRESTOp {
@@ -301,7 +303,7 @@ public:
   RGWRESTMgr_Log() = default;
   ~RGWRESTMgr_Log() override = default;
 
-  RGWHandler_REST* get_handler(rgw::sal::RGWRadosStore *store,
+  RGWHandler_REST* get_handler(rgw::sal::Store* store,
                               struct req_state* const,
                                const rgw::auth::StrategyRegistry& auth_registry,
                                const std::string& frontend_prefixs) override {