Skip to content

IPaddr2: add support to kill dangling IP connections #2076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

IPaddr2: add support to kill dangling IP connections #2076

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c97210
Adding support to kill dangling ip connections before and after delet…
alfonso-escribano Sep 25, 2025
77d1b36
Changes done as per PR#2076 feedback
alfonso-escribano Sep 25, 2025
94fb124
Changes done as per PR#2076 feedback
alfonso-escribano Sep 25, 2025
08e033a
Fix fi identation
alfonso-escribano Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions heartbeat/IPaddr2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ OCF_RESKEY_noprefixroute_default="false"
OCF_RESKEY_preferred_lft_default="forever"
OCF_RESKEY_network_namespace_default=""
OCF_RESKEY_check_link_status_default="true"
OCF_RESKEY_kill_connections_on_stop_default="false"

# RHEL specific defaults
if is_redhat_based; then
Expand Down Expand Up @@ -130,6 +131,7 @@ fi
: ${OCF_RESKEY_preferred_lft=${OCF_RESKEY_preferred_lft_default}}
: ${OCF_RESKEY_network_namespace=${OCF_RESKEY_network_namespace_default}}
: ${OCF_RESKEY_check_link_status=${OCF_RESKEY_check_link_status_default}}
: ${OCF_RESKEY_kill_connections_on_stop=${OCF_RESKEY_kill_connections_on_stop_default}}

#######################################################################

Expand Down Expand Up @@ -471,6 +473,14 @@ Consider the resource failed if the interface has status DOWN or LOWERLAYERDOWN.
<shortdesc lang="en">Consider the resource failed if the interface has status DOWN or LOWERLAYERDOWN</shortdesc>
<content type="string" default="${OCF_RESKEY_check_link_status_default}"/>
</parameter>

<parameter name="kill_connections_on_stop">
<longdesc lang="en">
Kill connections using 'ss -K src IP' before deleteing interface
</longdesc>
<shortdesc lang="en">Kill connections before remove ip</shortdesc>
<content type="string" default="${OCF_RESKEY_kill_connections_on_stop_default}"/>
</parameter>
</parameters>

<actions>
Expand Down Expand Up @@ -666,6 +676,37 @@ find_interface() {
return 0
}

#
# Kill dangling ip connections
#
kill_ip_connections() {
local ss_output=""
local ss_line=""
local ss_out_loglevel="info"

local ipaddr="$1"
Copy link
Contributor

@oalbrigt oalbrigt Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be the first line of the function.


check_binary ss

CMD="ss -Knp src $ipaddr"

ocf_log info "Calling $CMD"

ss_output=`$CMD 2>&1`
RC=$?

if [ $RC -ne 0 ]; then
ocf_log warn "Command $CMD failed (rc = ${THE_RC})"
ss_out_loglevel="error"
fi
[ -n "$ss_output" ] && echo "$ss_output" | while read ss_line;
do
ocf_log $ss_out_loglevel "$ss_line"
done

return $OCF_SUCCESS
}

#
# Delete an interface
#
Expand Down Expand Up @@ -1206,6 +1247,11 @@ ip_stop() {
exit $OCF_SUCCESS
fi

if ocf_is_true ${OCF_RESKEY_kill_connections_on_stop}; then
kill_ip_connections $OCF_RESKEY_ip
fi


if [ -n "$IP_CIP" ] && [ $ip_status != "partial2" ]; then
if [ $ip_status = "partial" ]; then
exit $OCF_SUCCESS
Expand Down Expand Up @@ -1240,6 +1286,9 @@ ip_stop() {
restore_loopback "$OCF_RESKEY_ip"
fi
fi
if ocf_is_true ${OCF_RESKEY_kill_connections_on_stop}; then
kill_ip_connections $OCF_RESKEY_ip
fi

exit $OCF_SUCCESS
}
Expand Down