fix broken use of streamstream::rdbuf() #19998
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
tchaikov
reviewed
Jan 18, 2018
| @@ -5981,7 +5981,7 @@ int OSDMonitor::prepare_command_pool_set(map<string,cmd_vartype> &cmdmap, | |||
| if (err == 0) { | |||
| k = erasure_code->get_data_chunk_count(); | |||
| } else { | |||
| ss << __func__ << " get_erasure_code failed: " << tmp.rdbuf(); | |||
| ss << __func__ << " get_erasure_code failed: " << tmp.str(); | |||
There was a problem hiding this comment.
@liewegas could you take this opportunity to s/rdbuf/str/ in PG.cc also?
There was a problem hiding this comment.
yep fixed, not sure how i missed that one :)
Fixes: http://tracker.ceph.com/issues/22715 Signed-off-by: Sage Weil <sage@redhat.com>
Several commands use 'id' but for other types (e.g., vector<int64_t>). Signed-off-by: Sage Weil <sage@redhat.com>
tchaikov
reviewed
Jan 19, 2018
| prefix != "osd pg-upmap" && | ||
| prefix != "osd pg-upmap-items") { // avoid commands with non-int id arg | ||
| osdid_present = cmd_getval(cct, cmdmap, "id", osdid); | ||
| } | ||
| if (osdid_present) { |
There was a problem hiding this comment.
since you are at here, could you remove the following if block and the string name; at 0580f01#diff-0a5db46a44ae9900e226289a810f10e8R7242 ? as name is always shadowed by the code which handles the specific commands.
tchaikov
approved these changes
Jan 19, 2018
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/22715