-
Notifications
You must be signed in to change notification settings - Fork 109
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
Fix FdbUpdater crash when SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID attribute missing. #286
Merged
qiluo-msft
merged 8 commits into
sonic-net:master
from
liuh-80:dev/liuh/improve-midupdater
Aug 30, 2023
Merged
Changes from all 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 35b86ed
Fix code
liuh-80 5d09e93
Merge branch 'master' into dev/liuh/improve-midupdater
qiluo-msft 45aabe0
Improve code
liuh-80 8fde7b4
Merge branch 'dev/liuh/improve-midupdater' of https://github.com/liuh…
liuh-80 0fb0f1d
Improve UT coverage
liuh-80 7934832
Improve code by PR comments
liuh-80 7b1aad1
Update PR comments
liuh-80 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.warn') as mocked_warn: | ||
updater.update_data() | ||
|
||
# check warning | ||
mocked_warn.assert_called() | ||
|
||
self.assertTrue(len(updater.vlanmac_ifindex_list) == 0) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
inreinit_data()
in order to prevent it increasing size forever in case the FDB entries become crazy.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed