rgw/dbstore: hide dbstore_log.h from rgw_main.cc #44581
Conversation
src/rgw/store/dbstore/dbstore_mgr.h
Outdated
| @@ -33,15 +33,6 @@ class DBStoreManager { | |||
| cct = _cct; | |||
| default_db = createDB(default_tenant); | |||
| }; | |||
| DBStoreManager(string logfile, int loglevel): DBStoreHandles() { | |||
There was a problem hiding this comment.
This is currently used at "https://github.com/ceph/ceph/blob/master/src/rgw/store/dbstore/dbstore_main.cc#L148" . That test file may soon be obsolete. So I am okay if it is removed.
There was a problem hiding this comment.
oops, i missed that! i added the constructor back, but replaced dout_subsys with ceph_subsys_rgw
that constructor should go away, because the CephContext should be managed outside of the store. and note that global_init() returns a reference-counted boost::intrusive_ptr<CephContext>, but this class only stores a raw pointer to that - which means the intrusive_ptr would go out of scope and delete the CephContext right after global_init() returns
There was a problem hiding this comment.
ah okay. Thanks! I will address it along with the other cleanup you have mentioned in the tracker.
dbstore_log.h sets global dout_subsys/dout_prefix macros, and was leaking into rgw_main.cc through the common/dbstore.h. this caused all of rgw_main's log output to start with the wrong prefix "rgw dbstore: " Fixes: https://tracker.ceph.com/issues/53177 Signed-off-by: Casey Bodley <cbodley@redhat.com>
dbstore_log.h sets global dout_subsys/dout_prefix macros, and was leaking into rgw_main.cc through the common/dbstore.h. this caused all of rgw_main's log output to start with the wrong prefix "rgw dbstore: "
Fixes: https://tracker.ceph.com/issues/53177
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox