pacific: log: Make log_max_recent have an effect again. #48311
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
|
needs-qa |
k0ste
force-pushed
the
wip-56635-pacific
branch
from
09a9af8
to
9289638
Compare
k0ste
force-pushed
the
wip-56635-pacific
branch
from
382e243
to
328cfc0
Compare
k0ste
force-pushed
the
wip-56635-pacific
branch
from
328cfc0
to
26ebd65
Compare
k0ste
force-pushed
the
wip-56635-pacific
branch
2 times, most recently
from
058a19c
to
76b2da3
Compare
|
@cbodley @k0ste @idryomov is this a blocker for 16.2.15? If so, add it to https://github.com/ceph/ceph/milestone/17 since Pacific is going EOL. |
Only developers can edit labels and milestones, I'm not |
idryomov
requested changes
Jan 11, 2024
There was a problem hiding this comment.
Conflicts:
- file: src/common/options/global.yaml.in
desc: not exists in pacific?
This file indeed doesn't exist in pacific, but simply dropping the hunk isn't right. Please tack on .set_min(1) on log_max_recent entry in src/common/options.cc:
Option("log_max_recent", Option::TYPE_INT, Option::LEVEL_ADVANCED)
.set_default(500)
.set_daemon_default(10000)
.set_min(1)
.set_description("recent log entries to keep in memory to dump in the event of a crash")
The log improvements in a747aea unfortunately left log_max_recent broken because m_max_recent wasn't used anymore. Eliminate m_max_recent and set the capacity of the m_recent ring buffer when log_max_recent changes. In order to call set_capacity(), ConcreteEntry needed its move constructor set noexcept. I haven't followed the boost code all the way down but I suspect that setting the ring buffer capacity to anything less than 1 entry will probably cause problems, so restrict log_max_recent to >=1. Also fix a wrong variable used for printing the max new entries during "log dump". Signed-off-by: Joshua Baergen <jbaergen@digitalocean.com> (cherry picked from commit 3d59ba1) Conflicts: - file: src/common/options/global.yaml.in desc: file not exists in pacific - file: src/common/options.cc desc: added 'set_min' for log_max_recent
k0ste
force-pushed
the
wip-56635-pacific
branch
from
76b2da3
to
847972f
Compare
|
Ilya, done |
idryomov
approved these changes
Jan 12, 2024
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.
backport tracker: https://tracker.ceph.com/issues/56635
backport of #46736
parent tracker: https://tracker.ceph.com/issues/56093
this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/main/src/script/ceph-backport.sh