RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44893 from cfsnyder/wip-54130-oplog-segfault

Browse Source 
rgw: fix segfault in OpsLogRados::log when realm is reloaded

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2022-02-05 08:54:57 -05:00 committed by GitHub
commit 1d25e87ed3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rgw/rgw_log.cc
View File

@ -472,7 +472,7 @@ int OpsLogSocket::log_json(struct req_state* s, bufferlist& bl)
return 0;
}
OpsLogRados::OpsLogRados(rgw::sal::Store* store): store(store)
OpsLogRados::OpsLogRados(rgw::sal::Store* const& store): store(store)
{
}

6
src/rgw/rgw_log.h
View File

@ -199,9 +199,11 @@ public:
};
class OpsLogRados : public OpsLogSink {
rgw::sal::Store* store;
// main()'s Store pointer as a reference, possibly modified by RGWRealmReloader
rgw::sal::Store* const& store;
public:
OpsLogRados(rgw::sal::Store* store);
OpsLogRados(rgw::sal::Store* const& store);
int log(struct req_state* s, struct rgw_log_entry& entry) override;
};