nautilus: osd/OSDMap: Replace get_out_osds with get_out_existing_osds #28072
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
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
|
retest this please. |
neha-ojha
reviewed
May 13, 2019
| @@ -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; | |||
There was a problem hiding this comment.
I'm not sure the resolution is correct here, we should not be using std:: to be consistent.
There was a problem hiding this comment.
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
approved these changes
May 13, 2019
|
jenkins retest this please |
|
jenkins test docs please |
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.
http://tracker.ceph.com/issues/39421