osd: limit pg log length under all circumstances#23098
Merged
jdurgin merged 7 commits intoceph:masterfrom Jul 18, 2018
Merged
Conversation
Signed-off-by: Neha Ojha <nojha@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
Member
Author
|
No related failures in rados run: http://pulpito.ceph.com/nojha-2018-07-17_03:31:35-rados-wip-23979-2018-07-16-distro-basic-smithi/ |
Member
Author
|
retest this please |
jdurgin
reviewed
Jul 17, 2018
src/osd/PGLog.cc
Outdated
| } | ||
|
|
||
| assert(s <= can_rollback_to); | ||
| generic_dout(0) << " complete_to " << complete_to->version << dendl; |
Member
There was a problem hiding this comment.
can use ldout(cct) instead of generic_dout - and should be higher level
Member
Author
There was a problem hiding this comment.
the entire function uses generic_dout(), so left it the same for uniformity. Increased the level to 20.
Signed-off-by: Neha Ojha <nojha@redhat.com>
61f63a7 to
a5329ba
Compare
jdurgin
approved these changes
Jul 17, 2018
Contributor
|
retest this please. |
Member
Author
|
this is passing |
3 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Before this,
osd_max_pg_log_entrieswas not a hard limit for the pg log length. This PR puts a hard cap on the number of log entries (and thus memory consumed) in the pg log, even during recovery and backfill.Fixes: https://tracker.ceph.com/issues/23979
Signed-off-by: Neha Ojha nojha@redhat.com