Fix show proc v3 #7
Closed
Conversation
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
Change mworker_env_to_proc_list() to if (child->pid > 0) before LIST_APPEND, avoiding invalid PIDs (0/-1) in the process list. This has no functional impact beyond stricter validation and it aligns with existing kill safeguards.
Drop the second #include <haproxy/list.h> from mworker.c. No functional change; reduces redundancy and keeps includes tidy.
alexanderstephan
force-pushed
the
fix-proc-v3
branch
from
606d11c to
3ece0a8
Compare
After commit 594408c ("BUG/MINOR: mworker/cli: 'show proc' is limited by buffer size"), related to ticket haproxy#3204, the "show proc" logic has been fixed to be able to print more than 202 processes. However, this fix can lead to the omission of entries in case they have the same timestamp. To fix this, we use the unique reload counter instead of the timestamp. On partial flush, set ctx->next_reload = child->reloads. On resume skip entries with child->reloads >= ctx->next_reload. Finally, we clear ctx->next_reload at the end of a complete dump so subsequent show proc starts from the top.
Introduce cli_append_worker_row() to centralize formatting of a single worker row. Also, replace duplicated row-printing code in both current and old workers loops with the helper. Motivation: Reduces LOC and improves readability by removing duplication.
alexanderstephan
force-pushed
the
fix-proc-v3
branch
from
3ece0a8 to
8b85185
Compare
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.
No description provided.