[v23.2.x] [CORE-96]: admin/server fix set_log_level handling of overlapping expirations #18445
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
|
/ci-repeat |
_log_level_resets is a map<str, level_reset>, we want to extract the next expiring level_reset to rearm the _log_level_timer. previously we would extract the min_element based on the key (the logger name) so this sequence of actions set log-level kafka trace 10 set log-level raft trace 10 only kafka would be expired, because once expired the next run would pick again kafka, see that there is no expiration, and not rearm the timer.
andijcr
force-pushed
the
vbotbuildovich/backport-18397-v23.2.x-221
branch
from
84b87b5
to
6444718
Compare
|
/ci-repeat |
andijcr
force-pushed
the
vbotbuildovich/backport-18397-v23.2.x-221
branch
from
6444718
to
8835ecd
Compare
andijcr
requested review from
a team,
aanthony-rp and
oleiman
and removed request for
a team
the test shows that this sequence of actions set log-level admin-api-server trace 10 set log-level raft trace 10 works and both logger are reset after the expiry period
andijcr
force-pushed
the
vbotbuildovich/backport-18397-v23.2.x-221
branch
from
8835ecd
to
e7c299a
Compare
oleiman
reviewed
May 14, 2024
Comment on lines
-625
to
+633
| auto next = std::min_element( | ||
| _log_level_resets.begin(), | ||
| _log_level_resets.end(), | ||
| [](const auto& a, const auto& b) { | ||
| return a.second.expires < b.second.expires; | ||
| }); | ||
|
|
||
| if (next != _log_level_resets.end()) { | ||
| _log_level_timer.arm(next->second.expires); | ||
| if (_log_level_resets.empty()) { | ||
| return; | ||
| } | ||
|
|
||
| auto reset_values = _log_level_resets | std::views::values; | ||
| auto& lvl_rst = *std::ranges::min_element( | ||
| reset_values, std::less<>{}, &level_reset::expires); | ||
| _log_level_timer.arm(lvl_rst.expires); |
There was a problem hiding this comment.
Is the original actually bugged? Seems like the motivating issue would have been isolated to v23.3+
There was a problem hiding this comment.
ah you are right, i didn't notice that v23.2 has the correct comparator
|
closing this as the bug is not in v23.2 |
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 of PR #18397
first commit adapted for v23.2
Fixes #18436