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.

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

IPaddr2: add support for network interfaces altname in the monitor operation #2027

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

IPaddr2: add support for network interfaces altname in the monitor operation #2027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion heartbeat/IPaddr2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,9 @@ find_interface() {
| grep " $ipaddr/$netmask" \
| cut -d ' ' -f2 \
| grep -v '^ipsec[0-9][0-9]*$'`"
local iface_altname="`$IP2UTIL -f inet link show dev $iface | grep "altname" | sed 's/^[[:space:]]*//; s/altname //g' | tr '\n' ' '`"

echo "$iface"
echo "$iface $iface_altname"
Copy link
Contributor

Choose a reason for hiding this comment

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

We should only return one interface name here, so you could do an if/else like if [ -n "$iface_altname" ]; then.

Copy link
Author

Choose a reason for hiding this comment

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

There's a comment a few lines up that says:
# Its output are interface names devided by spaces (e.g., "eth0 eth1").

According to my tests, it works when returning both names (added set -x):

root! server:~# pcs resource debug-monitor vipAB
Operation monitor for vipAB (ocf:heartbeat:IPaddr2) returned: 'ok' (0)
 >  stderr: + local ipaddr=192.xxxxxxx
 >  stderr: + local netmask=27
 >  stderr: + ip -o -f inet addr show
 >  stderr: + grep \ 192.xxxxxxxxx/27
 >  stderr: + cut -d   -f2
 >  stderr: + grep -v ^ipsec[0-9][0-9]*$
 >  stderr: + local iface=enp8s0f1
 >  stderr: + ip -f inet link show dev enp8s0f1
 >  stderr: + grep altname
 >  stderr: + sed s/^[[:space:]]*//; s/altname //g
 >  stderr: + tr \n  
 >  stderr: + local iface_altname=nic-third 
 >  stderr: + echo enp8s0f1 nic-third 
 >  stderr: + return 0

return 0
}

Expand Down