diff options
author | Yehuda Sadeh <yehuda@redhat.com> | 2019-06-06 02:33:50 +0200 |
---|---|---|
committer | Casey Bodley <cbodley@redhat.com> | 2019-07-29 21:20:48 +0200 |
commit | 0b8faf8a5d91b13631e79bc5d948e3a086693cf7 (patch) | |
tree | dba761d63ffb5592ff22524b08981119651f5cc4 /src/rgw/services/svc_mdlog.cc | |
parent | rgw: fixes following api changes (diff) | |
download | ceph-0b8faf8a5d91b13631e79bc5d948e3a086693cf7.tar.xz ceph-0b8faf8a5d91b13631e79bc5d948e3a086693cf7.zip |
rgw: RGWRados::lock_exclusive, ::unlock now being handled at svc.cls
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Diffstat (limited to 'src/rgw/services/svc_mdlog.cc')
-rw-r--r-- | src/rgw/services/svc_mdlog.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/rgw/services/svc_mdlog.cc b/src/rgw/services/svc_mdlog.cc index 1ba9a97b93c..8e394aa0d5d 100644 --- a/src/rgw/services/svc_mdlog.cc +++ b/src/rgw/services/svc_mdlog.cc @@ -24,12 +24,13 @@ RGWSI_MDLog::RGWSI_MDLog(CephContext *cct) : RGWServiceInstance(cct) { RGWSI_MDLog::~RGWSI_MDLog() { } -int RGWSI_MDLog::init(RGWSI_RADOS *_rados_svc, RGWSI_Zone *_zone_svc, RGWSI_SysObj *_sysobj_svc) +int RGWSI_MDLog::init(RGWSI_RADOS *_rados_svc, RGWSI_Zone *_zone_svc, RGWSI_SysObj *_sysobj_svc, RGWSI_Cls *_cls_svc) { - svc.zone = zone_svc; - svc.sysobj = sysobj_svc; + svc.zone = _zone_svc; + svc.sysobj = _sysobj_svc; svc.mdlog = this; - svc.rados = rados_svc; + svc.rados = _rados_svc; + svc.cls = _cls_svc; return 0; } @@ -357,7 +358,7 @@ RGWMetadataLog* RGWSI_MDLog::get_log(const std::string& period) // construct the period's log in place if it doesn't exist auto insert = md_logs.emplace(std::piecewise_construct, std::forward_as_tuple(period), - std::forward_as_tuple(cct, store, period)); + std::forward_as_tuple(cct, svc.zone, svc.cls, period)); return &insert.first->second; } |