kdump-lib: Retrieve xDUMP_COMMANDLINE_APPEND from sysconfig #133
Conversation
The current references to KDUMP_COMMANDLINE_APPEND or FADUMP_COMMANDLINE_APPEND return nothing because these variables are dynamically generated by gen-sysconfig-kdump.sh. To retrieve these variables, introduce a function get_dump_commandline(). It is the caller's responsibility to ensure '/etc/sysconfig/kdump' exists; otherwise, get_dump_commandline() will output an error message. Signed-off-by: Pingfan Liu <piliu@redhat.com>
Summary of ChangesHello @pfliu, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request resolves an issue where dynamically generated kdump and fadump command-line append variables were not being correctly referenced. It introduces a robust mechanism to parse these values directly from the system's kdump configuration file, ensuring that the kdump and fadump processes receive the intended command-line arguments. This change improves the reliability of kdump and fadump configurations by correctly sourcing critical parameters. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces a new function get_dump_commandline to correctly retrieve KDUMP_COMMANDLINE_APPEND and FADUMP_COMMANDLINE_APPEND from /etc/sysconfig/kdump, as these variables are not available in the environment. The changes in find_nr_cpus and fadump_bootargs_append correctly adopt this new function.
My main feedback is on the implementation of get_dump_commandline. While the grep and sed approach works, it's verbose, contains duplicated logic, and is less robust than sourcing the configuration file. I've suggested a refactoring to source /etc/sysconfig/kdump within a subshell. This is a cleaner, more idiomatic, and safer approach that aligns with existing practices in the codebase for handling sysconfig files.
| get_dump_commandline() | ||
| { | ||
| local _dump_mode=$1 | ||
| local _cmdline_append | ||
| if ! [ -e "$KDUMP_SYSCONFIG_FILE" ]; then | ||
| derror "No $KDUMP_SYSCONFIG_FILE yet" | ||
| return 1 | ||
| fi | ||
| if [ "$_dump_mode" = "fadump" ]; then | ||
| _cmdline_append=$(grep '^\s*FADUMP_COMMANDLINE_APPEND\s*=' "$KDUMP_SYSCONFIG_FILE" | \ | ||
| sed 's/^\s*FADUMP_COMMANDLINE_APPEND\s*=\s*"\(.*\)".*$/\1/') | ||
| else | ||
| _cmdline_append=$(grep '^\s*KDUMP_COMMANDLINE_APPEND\s*=' "$KDUMP_SYSCONFIG_FILE" | \ | ||
| sed 's/^\s*KDUMP_COMMANDLINE_APPEND\s*=\s*"\(.*\)".*$/\1/') | ||
| fi | ||
| echo "$_cmdline_append" | ||
| } |
There was a problem hiding this comment.
Instead of using grep and sed to parse the sysconfig file, it's simpler and more robust to source the file in a subshell. This avoids potential parsing issues and aligns with how shell configuration files are typically handled. The subshell ensures that the sourced variables do not pollute the main script's environment.
get_dump_commandline()
{
local _dump_mode=$1
if ! [ -e "$KDUMP_SYSCONFIG_FILE" ]; then
derror "No $KDUMP_SYSCONFIG_FILE yet"
return 1
fi
(
# shellcheck source=/dev/null
. "$KDUMP_SYSCONFIG_FILE"
if [ "$_dump_mode" = "fadump" ]; then
# shellcheck disable=SC2153
echo "$FADUMP_COMMANDLINE_APPEND"
else
# shellcheck disable=SC2153
echo "$KDUMP_COMMANDLINE_APPEND"
fi
)
}1 participant
The current references to KDUMP_COMMANDLINE_APPEND or FADUMP_COMMANDLINE_APPEND return nothing because these variables are dynamically generated by gen-sysconfig-kdump.sh.
To retrieve these variables, introduce a function
get_dump_commandline(). It is the caller's responsibility to ensure '/etc/sysconfig/kdump' exists; otherwise, get_dump_commandline() will output an error message.