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

Fix FdbUpdater crash when SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID attribute missing. #286

Merged
merged 8 commits into from
Aug 30, 2023
Merged

Fix FdbUpdater crash when SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID attribute missing. #286

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ed53a5c
Fix MIBUpdater crash when SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID attribute…
liuh-80 Jul 21, 2023
35b86ed
Fix code
liuh-80 Jul 21, 2023
5d09e93
Merge branch 'master' into dev/liuh/improve-midupdater
qiluo-msft Jul 27, 2023
45aabe0
Improve code
liuh-80 Jul 27, 2023
8fde7b4
Merge branch 'dev/liuh/improve-midupdater' of https://github.com/liuh…
liuh-80 Jul 27, 2023
0fb0f1d
Improve UT coverage
liuh-80 Jul 27, 2023
7934832
Improve code by PR comments
liuh-80 Aug 22, 2023
7b1aad1
Update PR comments
liuh-80 Aug 30, 2023
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
13 changes: 12 additions & 1 deletion src/sonic_ax_impl/mibs/ietf/rfc4363.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def __init__(self):
self.vlanmac_ifindex_list = []
self.if_bpid_map = {}
self.bvid_vlan_map = {}
self.broken_fdbs = []

def fdb_vlanmac(self, fdb):
if 'vlan' in fdb:
Expand Down Expand Up @@ -85,8 +86,18 @@ def update_data(self):
if not ent:
continue

bridge_port_id_attr = ""
try:
bridge_port_id_attr = ent["SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID"]
except KeyError as e:
# Only write error log once
if fdb_str not in self.broken_fdbs:
mibs.logger.error("SyncD 'ASIC_DB' includes invalid FDB_ENTRY '{}': failed to get bridge_port_id, exception: {}".format(fdb_str, e))
Copy link
Contributor

@qiluo-msft qiluo-msft Aug 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

log at warning level, because we skip it and continue with others. #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

self.broken_fdbs.append(fdb_str)
continue
Copy link
Contributor

@qiluo-msft qiluo-msft Aug 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

continue

If we continue and it will the error message will repeat. In a real device, how frequent is the same error messages? do we need to damp the speed?

Original code will throw a stack in syslog, but not very frequent. #Closed

Copy link
Contributor Author

@liuh-80 liuh-80 Aug 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

The log will repeat every 5 seconds, seems not necessary to add more delay:

in https://github.com/sonic-net/sonic-snmpagent/blob/master/src/sonic_ax_impl/main.py

# Background task update frequency ( in seconds )
DEFAULT_UPDATE_FREQUENCY = 5

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed, every FDB only output error log once.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the fix! Further suggestion: flush broken_fdbs in reinit_data() in order to prevent it increasing size forever in case the FDB entries become crazy.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed


# Example output: oid:0x3a000000000608
bridge_port_id = ent["SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID"][6:]
bridge_port_id = bridge_port_id_attr[6:]
if bridge_port_id not in self.if_bpid_map:
continue
port_id = self.if_bpid_map[bridge_port_id]
Expand Down
28 changes: 28 additions & 0 deletions tests/test_rfc4363.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import os
import sys
from unittest import TestCase

if sys.version_info.major == 3:
from unittest import mock
else:
import mock

modules_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.insert(0, os.path.join(modules_path, 'src'))

from sonic_ax_impl.mibs.ietf.rfc4363 import FdbUpdater

class TestFdbUpdater(TestCase):

@mock.patch('sonic_ax_impl.mibs.Namespace.dbs_keys', mock.MagicMock(return_value=(['ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY:{"bvid":"oid:0x26000000000b6c","mac":"60:45:BD:98:6F:48","switch_id":"oid:0x21000000000000"}'])))
@mock.patch('sonic_ax_impl.mibs.Namespace.dbs_get_all', mock.MagicMock(return_value=({"nexthop": "10.0.0.1,10.0.0.3", "ifname": "Ethernet0,Ethernet4"})))
def test_FdbUpdater_ent_bridge_port_id_attr_missing(self):
updater = FdbUpdater()

with mock.patch('sonic_ax_impl.mibs.logger.error') as mocked_error:
updater.update_data()

# check warning
mocked_error.assert_called()

self.assertTrue(len(updater.vlanmac_ifindex_list) == 0)