rpms/kexec-tools
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show how much time kdump has waited for the network to be ready

Browse Source 
Relates: https://bugzilla.redhat.com/show_bug.cgi?id=2151504

Currently, when the network isn't ready, kdump would repeatedly print
the same info,

    [   29.537230] kdump[671]: Bad kdump network destination: 192.123.1.21
    [   30.559418] kdump[679]: Bad kdump network destination: 192.123.1.21
    [   31.580189] kdump[687]: Bad kdump network destination: 192.123.1.21

This is not user-friendly and users may think kdump has got stuck. So
also show much time has waited for the network to be ready,

    [   29.546258] kdump[673]: Waiting for network to be ready (50s / 10min)
    ...
    [   32.608967] kdump[697]: Waiting for network to be ready (56s / 10min)

Note kdump_get_ip_route no longer prints an error message and it's up to
the caller to determine the log level and print relevant messages. And
kdump_collect_netif_usage aborts when kdump_get_ip_route fails.

Reported-by: Martin Pitt <mpitt@redhat.com>
Signed-off-by: Coiby Xu <coxu@redhat.com>
Reviewed-by: Philipp Rudo <prudo@redhat.com>
This commit is contained in:
Coiby Xu 2023-03-28 16:33:34 +08:00
parent df6f25ff20
commit 12d9eff9dc
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dracut-kdump.sh
View File

@ -495,6 +495,8 @@ wait_online_network()
if _route=$(kdump_get_ip_route "$1" 2> /dev/null); then if _route=$(kdump_get_ip_route "$1" 2> /dev/null); then
printf "%s" "$_route" printf "%s" "$_route"
return return
else
dwarn "Waiting for network to be ready (${_loop}s / 10min)"
fi fi
done done

7
dracut-module-setup.sh
View File

@ -540,7 +540,12 @@ kdump_collect_netif_usage() {
local _destaddr _srcaddr _route _netdev local _destaddr _srcaddr _route _netdev
_destaddr=$(kdump_get_remote_ip "$1") _destaddr=$(kdump_get_remote_ip "$1")
_route=$(kdump_get_ip_route "$_destaddr")
if ! _route=$(kdump_get_ip_route "$_destaddr"); then
derror "Bad kdump network destination: $_destaddr"
exit 1
fi
_srcaddr=$(kdump_get_ip_route_field "$_route" "src") _srcaddr=$(kdump_get_ip_route_field "$_route" "src")
_netdev=$(kdump_get_ip_route_field "$_route" "dev") _netdev=$(kdump_get_ip_route_field "$_route" "dev")

1
kdump-lib-initramfs.sh
View File

@ -167,7 +167,6 @@ is_lvm2_thinp_device()
kdump_get_ip_route() kdump_get_ip_route()
{ {
if ! _route=$(/sbin/ip -o route get to "$1" 2>&1); then if ! _route=$(/sbin/ip -o route get to "$1" 2>&1); then
derror "Bad kdump network destination: $1"
exit 1 exit 1
fi fi
echo "$_route" echo "$_route"