update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rgw / services / svc_bi_rados.h

diff --git a/ceph/src/rgw/services/svc_bi_rados.h b/ceph/src/rgw/services/svc_bi_rados.h
index d59d3606a96ff2d2174509921eadc1403eb4a8c2..b25f7449275127fd80e28ed807ece740cf70c669 100644 (file)
--- a/ceph/src/rgw/services/svc_bi_rados.h
+++ b/ceph/src/rgw/services/svc_bi_rados.h
@@ -1,4 +1,3 @@
-
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab ft=cpp
 
@@ -17,6 +16,7 @@
 
 #pragma once
 
+#include "rgw/rgw_datalog.h"
 #include "rgw/rgw_service.h"
 #include "rgw/rgw_tools.h"
 
@@ -26,7 +26,6 @@
 struct rgw_bucket_dir_header;
 
 class RGWSI_BILog_RADOS;
-class RGWSI_DataLog_RADOS;
 
 #define RGW_NO_SHARD -1
 
@@ -50,9 +49,10 @@ class RGWSI_BucketIndex_RADOS : public RGWSI_BucketIndex
   void get_bucket_index_object(const string& bucket_oid_base,
                                uint32_t num_shards,
                                int shard_id,
+                               uint64_t gen_id,
                                string *bucket_obj);
   int get_bucket_index_object(const string& bucket_oid_base, const string& obj_key,
-                              uint32_t num_shards, RGWBucketInfo::BIShardsHashType hash_type,
+                              uint32_t num_shards, rgw::BucketHashType hash_type,
                               string *bucket_obj, int *shard_id);
 
   int cls_bucket_head(const RGWBucketInfo& bucket_info,
@@ -67,7 +67,7 @@ public:
     RGWSI_Zone *zone{nullptr};
     RGWSI_RADOS *rados{nullptr};
     RGWSI_BILog_RADOS *bilog{nullptr};
-    RGWSI_DataLog_RADOS *datalog_rados{nullptr};
+    RGWDataChangesLog *datalog_rados{nullptr};
   } svc;
 
   RGWSI_BucketIndex_RADOS(CephContext *cct);
@@ -75,7 +75,7 @@ public:
   void init(RGWSI_Zone *zone_svc,
             RGWSI_RADOS *rados_svc,
             RGWSI_BILog_RADOS *bilog_svc,
-            RGWSI_DataLog_RADOS *datalog_rados_svc);
+            RGWDataChangesLog *datalog_rados_svc);
 
   static int shards_max() {
     return RGW_SHARDS_PRIME_1;
@@ -115,6 +115,7 @@ public:
 
   int open_bucket_index_shard(const RGWBucketInfo& bucket_info,
                               int shard_id,
+                              const rgw::bucket_index_layout_generation& idx_layout,
                               RGWSI_RADOS::Obj *bucket_obj);
 
   int open_bucket_index(const RGWBucketInfo& bucket_info,