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

nautilus: osd/OSDMap: Replace get_out_osds with get_out_existing_osds #28072

Merged
merged 1 commit into from May 28, 2019

Conversation

@pdvian
Copy link

pdvian commented May 13, 2019

Fixes: http://tracker.ceph.com/issues/39154

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit adfb6a5)

Conflicts:
	src/osd/OSDMap.h : Resolved for get_out_existing_osds
@smithfarm smithfarm added this to the nautilus milestone May 13, 2019
@smithfarm smithfarm requested review from badone and neha-ojha May 13, 2019
@smithfarm smithfarm added the core label May 13, 2019
@tchaikov

This comment has been minimized.

Copy link
Contributor

tchaikov commented May 13, 2019

retest this please.

@@ -714,6 +714,7 @@ class OSDMap {
void get_all_osds(set<int32_t>& ls) const;
void get_up_osds(set<int32_t>& ls) const;
void get_out_osds(set<int32_t>& ls) const;
void get_out_existing_osds(std::set<int32_t>& ls) const;

This comment has been minimized.

Copy link
@neha-ojha

neha-ojha May 13, 2019

Member

I'm not sure the resolution is correct here, we should not be using std:: to be consistent.

This comment has been minimized.

Copy link
@badone

badone May 13, 2019

Contributor

But it's a header so all references to std:: objects should be fully qualified. There is no "using namespace std" in the file so the lines above it are incorrect and only work by good fortune :) If anything, all the other lines need to be fully qualified but I don't believe that is in the scope of the backport and would tend to obfuscate git history anyway so probably not worth it at this time.

@badone
badone approved these changes May 13, 2019
Copy link
Contributor

badone left a comment

As long as Neha is happy I'm happy.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented May 23, 2019

@badone

This comment has been minimized.

Copy link
Contributor

badone commented May 28, 2019

jenkins retest this please

@tchaikov

This comment has been minimized.

Copy link
Contributor

tchaikov commented May 28, 2019

jenkins test docs please

@yuriw yuriw merged commit d497c2e into ceph:nautilus May 28, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.