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

[Namespace]: Fix SNMP AgentX socket connection timeout when using Namespace.get_all() #140

Merged
merged 9 commits into from
Jul 11, 2020
Merged

[Namespace]: Fix SNMP AgentX socket connection timeout when using Namespace.get_all() #140

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
16f36d8
[Namespace]: Remove key exists check in dbs_get_all
SuvarnaMeenakshi Jul 10, 2020
af7d4f4
Fix as per review comment.
SuvarnaMeenakshi Jul 10, 2020
7cfc43d
Minor fix.
SuvarnaMeenakshi Jul 10, 2020
e264498
Connect to all required namespace dbs during init and periodic
SuvarnaMeenakshi Jul 10, 2020
a10f55f
Change test_mibs to use generic wrapper function added.
SuvarnaMeenakshi Jul 10, 2020
2fd0960
Fix review comment.
SuvarnaMeenakshi Jul 11, 2020
7e9eb50
Fix as per review comment.
SuvarnaMeenakshi Jul 11, 2020
9c4efd6
Remove whitespace.
SuvarnaMeenakshi Jul 11, 2020
fbba260
Fix review comment. Avoid modifying mutable object kwargs,
SuvarnaMeenakshi Jul 11, 2020
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
11 changes: 7 additions & 4 deletions src/sonic_ax_impl/mibs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,12 +552,15 @@ def dbs_get_all(dbs, db_name, _hash, *args, **kwargs):
db get_all function executed on global and all namespace DBs.
"""
result = {}
# If there are multiple namespaces, _hash might not be
# present in all namespace, ignore if not present in a
# specfic namespace.
if (len(dbs) > 1) : kwargs['blocking'] = False
Copy link
Contributor

@qiluo-msft qiluo-msft Jul 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

kwargs['blocking'] = False [](start = 28, length = 26)

Please move it in next line. #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 as per comment.

Copy link
Contributor

@qiluo-msft qiluo-msft Jul 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

( [](start = 11, length = 1)

you can remove '()' #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 as per comment.

Copy link
Contributor

@qiluo-msft qiluo-msft Jul 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

kwargs [](start = 28, length = 6)

This parameter is passed as reference, and it is mutable.
If you change it inside function, it will have side-effect to the caller's scope. Could you do not change it? #Closed

Copy link
Contributor

Choose a reason for hiding this comment

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

@qiluo-msft We were initially updating all the function call arguments and the changes were spread in multiple places. This approach looks better where only for Multi-Asic we are making blocking as False and for single asic behavior remains unchanged.
Also caller should not be impacted by this as it does not get used in caller scope and just passes the value to the library.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As per suggestion, instead of modifying kwargs directly, did a shallow copy to change.

for db_conn in dbs:
db_conn.connect(db_name)
if(db_conn.exists(db_name, _hash)):
ns_result = db_conn.get_all(db_name, _hash, *args, **kwargs)
if ns_result is not None:
result.update(ns_result)
ns_result = db_conn.get_all(db_name, _hash, *args, **kwargs)
if ns_result is not None:
result.update(ns_result)
return result

@staticmethod
Expand Down