diff options
| author | Daniel Gryniewicz <dang@redhat.com> | 2021-01-18 18:25:39 +0100 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@redhat.com> | 2021-03-02 13:35:05 +0100 |
| commit | 72d1a363263cf707d022ee756122236ba175cda2 (patch) | |
| tree | 3eaf8e8726594a33f23b56a0ad790953a6693986 /src/rgw/rgw_lua_request.cc | |
| parent | Merge pull request #39714 from zdover23/wip-doc-cephadm-typo-togeter-2021-Feb-26 (diff) | |
| download | ceph-72d1a363263cf707d022ee756122236ba175cda2.tar.xz ceph-72d1a363263cf707d022ee756122236ba175cda2.zip | |
RGW - Zipper 10: Pull The Thread
This commit changes the RGWStoreManager to return a RGWStore* rather
than a RGWRadosStore*. This is the thread that unravels the rest of the
Zipper work, removing hard-coded uses of the RGWRados* classes.
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
Diffstat (limited to 'src/rgw/rgw_lua_request.cc')
| -rw-r--r-- | src/rgw/rgw_lua_request.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rgw/rgw_lua_request.cc b/src/rgw/rgw_lua_request.cc index b5654d6df1e..8cf475e00d6 100644 --- a/src/rgw/rgw_lua_request.cc +++ b/src/rgw/rgw_lua_request.cc @@ -30,7 +30,7 @@ int RequestLog(lua_State* L) const auto s = reinterpret_cast<req_state*>(lua_touserdata(L, lua_upvalueindex(4))); const std::string op_name(reinterpret_cast<const char*>(lua_touserdata(L, lua_upvalueindex(5)))); if (store && s) { - const auto rc = rgw_log_op(store->getRados(), rest, s, op_name, olog); + const auto rc = rgw_log_op(store, rest, s, op_name, olog); lua_pushinteger(L, rc); } else { ldout(s->cct, 1) << "Lua ERROR: missing rados store, cannot use ops log" << dendl; @@ -769,7 +769,7 @@ struct RequestMetaTable : public EmptyMetaTable { }; int execute( - rgw::sal::RGWRadosStore* store, + rgw::sal::RGWStore* store, RGWREST* rest, OpsLogSocket* olog, req_state* s, |