Skip to content
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.

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

IPaddr2/IPsrcaddr: add "skip_more_than_one_route_matches_check" parameter #2013

Closed
Closed
Changes from all commits
Commits
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
IPaddr2/IPsrcaddr: add "skip_more_than_one_route_matches_check" param…
…eter
oalbrigt committed Jan 21, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 4fc29bf0223f87beb7076c9c2176869c209b403c
12 changes: 12 additions & 0 deletions heartbeat/IPaddr2
Original file line number Diff line number Diff line change
@@ -92,6 +92,7 @@ OCF_RESKEY_nodad_default=false
OCF_RESKEY_noprefixroute_default="false"
OCF_RESKEY_preferred_lft_default="forever"
OCF_RESKEY_network_namespace_default=""
OCF_RESKEY_skip_more_than_one_route_matches_check_default="false"

: ${OCF_RESKEY_ip=${OCF_RESKEY_ip_default}}
: ${OCF_RESKEY_cidr_netmask=${OCF_RESKEY_cidr_netmask_default}}
@@ -116,6 +117,7 @@ OCF_RESKEY_network_namespace_default=""
: ${OCF_RESKEY_noprefixroute=${OCF_RESKEY_noprefixroute_default}}
: ${OCF_RESKEY_preferred_lft=${OCF_RESKEY_preferred_lft_default}}
: ${OCF_RESKEY_network_namespace=${OCF_RESKEY_network_namespace_default}}
: ${OCF_RESKEY_skip_more_than_one_route_matches_check=${OCF_RESKEY_skip_more_than_one_route_matches_check_default}}

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

@@ -449,6 +451,16 @@ the namespace.
<shortdesc lang="en">Network namespace to use</shortdesc>
<content type="string" default="${OCF_RESKEY_network_namespace_default}"/>
</parameter>

<parameter name="skip_more_than_one_route_matches_check">
<longdesc lang="en">
Skip More than 1 route matches check.
Might cause issues in some edge cases, and could result in unexpected changes
in the routing table being ignored.
</longdesc>
<shortdesc lang="en">Skip "More than 1 routes match" check</shortdesc>
<content type="string" default="${OCF_RESKEY_skip_more_than_one_route_matches_check_default}"/>
</parameter>
</parameters>

<actions>
12 changes: 12 additions & 0 deletions heartbeat/IPsrcaddr
Original file line number Diff line number Diff line change
@@ -62,6 +62,7 @@ OCF_RESKEY_proto_default=""
OCF_RESKEY_metric_default=""
OCF_RESKEY_pref_default=""
OCF_RESKEY_table_default=""
OCF_RESKEY_skip_more_than_one_route_matches_check_default="false"

: ${OCF_RESKEY_ipaddress=${OCF_RESKEY_ipaddress_default}}
: ${OCF_RESKEY_cidr_netmask=${OCF_RESKEY_cidr_netmask_default}}
@@ -70,6 +71,7 @@ OCF_RESKEY_table_default=""
: ${OCF_RESKEY_metric=${OCF_RESKEY_metric_default}}
: ${OCF_RESKEY_pref=${OCF_RESKEY_pref_default}}
: ${OCF_RESKEY_table=${OCF_RESKEY_table_default}}
: ${OCF_RESKEY_skip_more_than_one_route_matches_check=${OCF_RESKEY_skip_more_than_one_route_matches_check_default}}
#######################################################################

[ -z "$OCF_RESKEY_proto" ] && PROTO="" || PROTO="proto $OCF_RESKEY_proto"
@@ -178,6 +180,16 @@ This can be used for policy based routing. See man ip-rule(8).
<content type="string" default="${OCF_RESKEY_table_default}" />
</parameter>

<parameter name="skip_more_than_one_route_matches_check">
<longdesc lang="en">
Skip More than 1 route matches check.
Might cause issues in some edge cases, and could result in unexpected changes
in the routing table being ignored.
</longdesc>
<shortdesc lang="en">Skip "More than 1 routes match" check</shortdesc>
<content type="string" default="${OCF_RESKEY_skip_more_than_one_route_matches_check_default}"/>
</parameter>

</parameters>

<actions>
2 changes: 1 addition & 1 deletion heartbeat/findif.sh
Original file line number Diff line number Diff line change
@@ -225,7 +225,7 @@ findif()
routematch=$(echo "$routematch" | grep -v "^default")
fi

if [ $(echo "$routematch" | wc -l) -gt 1 ]; then
if ! ocf_is_true "$OCF_RESKEY_skip_more_than_one_route_matches_check" && [ $(echo "$routematch" | wc -l) -gt 1 ]; then
ocf_exit_reason "More than 1 routes match $match. Unable to decide which route to use."
return $OCF_ERR_GENERIC
fi