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

Jump to bottom

Add nic detect for IPaddr and IPaddr2 #1969

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+126 −0
Open

Add nic detect for IPaddr and IPaddr2 #1969

Show file tree
Hide file tree
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
62 changes: 62 additions & 0 deletions heartbeat/IPaddr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,11 +746,73 @@ ip_status() {
return $rc;
}

nic_monitor() {
grep -r bonding /etc/modprobe.d/ | grep "$NIC" | grep ^[^#]
if [ "$?" -eq 0 ];then
BB=`ls /etc/sysconfig/network-scripts/ifcfg-*`
bb_n=0
bb_m=0
for AA in $BB;do
cat $AA | grep "$NIC" | grep "MASTER" | grep ^[^#]
if [ "$?" -eq 0 ];then
let bb_n=$bb_n+1
NIC_n=`echo $AA |awk -F- '{print $3}'`
ifconfig $NIC_n | grep "UP"
rc=$?
if [ "$rc" -ge 1 ];then
let bb_m=$bb_m+1
else
nic_status=`ethtool "$NIC_n" | grep "Link detected" | awk -F": " '{print $2}'`
case "$nic_status" in
*no)
let bb_m=$bb_m+1;;
esac
fi
fi
done
if [ "$bb_n" = "$bb_m" ];then
return $OCF_ERR_GENERIC
else
return $OCF_SUCCESS
fi

else
ifconfig $NIC | grep "UP"
rc=$?
if [ "$rc" -ge 1 ];then
return $OCF_ERR_GENERIC
else
nic_status=`ethtool "$NIC" | grep "Link detected" | awk -F": " '{print $2}'`
case "$nic_status" in
*yes)
return $OCF_SUCCESS;;
*no)
return $OCF_ERR_GENERIC;;
esac
fi
fi
}

#
# Determine if this IP address is really being served, or not.
# Note that we must distinguish if *we're* serving it locally...
#
ip_monitor() {
case "$OCF_CHECK_LEVEL" in
0)
;;
10)
nic_monitor
if [ $? -ne 0 ] ;
then
ocf_exit_reason $OCF_ERR_GENERIC
fi
;;
*)
ocf_exit_reason "unsupported monitor level $OCF_CHECK_LEVEL"
return $OCF_ERR_CONFIGURED
;;
esac
ip_status_internal
rc=$?

Expand Down
64 changes: 64 additions & 0 deletions heartbeat/IPaddr2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,54 @@ remove_conflicting_loopback() {
delete_route "$ipaddr" "$ifname"
}

nic_monitor() {
grep -r bonding /etc/modprobe.d/ | grep "$NIC" | grep ^[^#]
if [ "$?" -eq 0 ];then
BB=`ls /etc/sysconfig/network-scripts/ifcfg-*`
bb_n=0
bb_m=0
for AA in $BB;do
cat $AA | grep "$NIC" | grep "MASTER" | grep ^[^#]
if [ "$?" -eq 0 ];then
let bb_n=$bb_n+1
NIC_n=`echo $AA |awk -F- '{print $3}'`
ifconfig $NIC_n | grep "UP"
rc=$?
if [ "$rc" -ge 1 ];then
let bb_m=$bb_m+1
else
nic_status=`ethtool "$NIC_n" | grep "Link detected" | awk -F": " '{print $2}'`
case "$nic_status" in
*no)
let bb_m=$bb_m+1;;
esac
fi
fi
done
if [ "$bb_n" = "$bb_m" ];then
return $OCF_ERR_GENERIC
else
return $OCF_SUCCESS
fi

else
ifconfig $NIC | grep "UP"
rc=$?
if [ "$rc" -ge 1 ];then
return $OCF_ERR_GENERIC
else
nic_status=`ethtool "$NIC" | grep "Link detected" | awk -F": " '{print $2}'`
case "$nic_status" in
*yes)
return $OCF_SUCCESS;;
*no)
return $OCF_ERR_GENERIC;;
esac
fi
fi
}


#
# On Linux systems the (hidden) loopback interface may
# need to be restored if it has been taken down previously
Expand Down Expand Up @@ -1184,6 +1232,22 @@ ip_monitor() {
# interface health maybe via a daemon like FailSafe etc...

local ip_status=`ip_served`
case "$OCF_CHECK_LEVEL" in
0)
;;
10)
nic_monitor
if [ $? -ne 0 ] ;
then
ocf_exit_reason $OCF_ERR_GENERIC
fi
;;
*)
ocf_exit_reason "unsupported monitor level $OCF_CHECK_LEVEL"
return $OCF_ERR_CONFIGURED
;;
esac

case $ip_status in
ok)
run_arp_sender refresh
Expand Down