rgw: hold reloader using unique_ptr #36521
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
instead of using optional<> for holding reloader, use unique_ptr<>.
as `RGWRealmReloader` is neither
trivially_copy_{assignable,constructible} nor
is_trivially_move_{assignable, constructible}, because of the `Cond`
member variable. but Clang++ and libc++ still tries to rely on a
delgating copy constructor for constructing the
optional<RGWRealmReloader> instance even the optional object is
created `in_place`.
in this change, to workaround this issue, reloader is instead
constructed using make_unique<>
Signed-off-by: Kefu Chai <kchai@redhat.com>
wjwithagen
approved these changes
Aug 8, 2020
There was a problem hiding this comment.
Thanx Kefu
This makes Nautilus compile just fine.
Would be nice to get this backported into Nautilus, but otherwise I'll carry it along in my FreeBSD patch set.
Only the patch offset is different:
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -565,8 +565,8 @@ int main(int argc, const char **argv)
// add a watcher to respond to realm configuration changes
RGWPeriodPusher pusher(store);
RGWFrontendPauser pauser(fes, implicit_tenant_context, &pusher);
- std::optional<RGWRealmReloader> reloader(std::in_place, store,
- service_map_meta, &pauser);
+ auto reloader = std::make_unique<RGWRealmReloader>(store,
+ service_map_meta, &pauser);
RGWRealmWatcher realm_watcher(g_ceph_context, store->svc.zone->get_realm());
realm_watcher.add_watcher(RGWRealmNotify::Reload, *reloader);
please file a tracker ticket to make sure it is backported after this change is approved and merged. |
dang
approved these changes
Aug 10, 2020
4 tasks
Done. See https://tracker.ceph.com/issues/47113 (both backports are already in progress). |
|
@smithfarm thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
instead of using optional<> for holding reloader, use unique_ptr<>.
as
RGWRealmReloaderis neithertrivially_copy_{assignable,constructible} nor
is_trivially_move_{assignable, constructible}, because of the
Condmember variable. but Clang++ and libc++ still tries to rely on a
delgating copy constructor for constructing the
optional instance even the optional object is
created
in_place.in this change, to workaround this issue, reloader is instead
constructed using make_unique<>
Signed-off-by: Kefu Chai kchai@redhat.com
Checklist
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 apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox