Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osd,mgrclient: pass daemon_status by rvalue ref and other cleanups #18509

Merged
merged 5 commits into from Nov 1, 2017

Conversation

tchaikov
Copy link
Contributor

@tchaikov tchaikov commented Oct 24, 2017

this is a spin-off of #18468. it's posted separately in hope to get reviewed sooner.

Signed-off-by: Kefu Chai <kchai@redhat.com>
to be consistent with other caller sites of add_event_after(). the
original intention of doing so, is to avoid double free of the callback
to be added if we are stopping and the timer refuses to add this
callback.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
@@ -1318,7 +1318,7 @@ namespace librados
const std::string& name, ///< daemon name (e.g., 'gwfoo')
const std::map<std::string,std::string>& metadata); ///< static metadata about daemon
int service_daemon_update_status(
const std::map<std::string,std::string>& status);
std::map<std::string,std::string>&& status);
Copy link
Contributor Author

@tchaikov tchaikov Oct 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the ABI change was discussed at #18468 (comment)

@tchaikov tchaikov added the mgr label Oct 24, 2017
@tchaikov tchaikov changed the title osd,mgrclient: pass daemon_status by rvalue and other cleanups osd,mgrclient: pass daemon_status by rvalue ref and other cleanups Oct 24, 2017
@liewegas liewegas merged commit 4efbb32 into ceph:master Nov 1, 2017
@tchaikov tchaikov deleted the wip-osd-cleanups branch November 1, 2017 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants