[hostcfgd] Fixed the brief blackout in hostcfgd using SubscriberStateTable #16
Conversation
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
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
vivekrnv
changed the title
vivekrnv
changed the title
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
stepanblyschak
suggested changes
Sep 13, 2021
| try: | ||
| ret = ast.literal_eval(val) | ||
| except Exception as e: | ||
| ret = False |
There was a problem hiding this comment.
The default value is recorded in two places, one is here, one in the line: self.__safe_eval_bool(feature_cfg.get('has_timer', 'False'))
There was a problem hiding this comment.
The idea is, if the user programs something, invalid apart from True or False, this shouldn't fail.
If the user programs anything other than ''True", the value is set to False
| from swsscommon.swsscommon import ConfigDBConnector | ||
| from sonic_py_common.device_info import is_multi_npu, get_num_npus | ||
| from swsscommon.swsscommon import SubscriberStateTable, DBConnector, Select | ||
| from swsscommon.swsscommon import ConfigDBConnector, TableConsumable |
There was a problem hiding this comment.
Do you still need ConfigDBConnector?
There was a problem hiding this comment.
Yes, i'm still using that for non-active listener use cases. The active listener responsibility is transferred to SubscriberStateTable
There was a problem hiding this comment.
What is the difference between active/non-active listeners?
There was a problem hiding this comment.
Sorry, i haven't framed it properly. I meant, i did not change some of the existing code which fetches tables from the DB . Eg: https://github.com/vivekreddynv/sonic-buildimage/blob/1d626893843cd4514494f280fa7c1eb1159f002c/src/sonic-host-services/scripts/hostcfgd#L905
|
|
||
| class HostConfigDaemon: | ||
| def __init__(self): | ||
| # Just a sanity check to verify if the CONFIG_DB has been initialized | ||
| # before moving forward |
There was a problem hiding this comment.
Why do we need this explicitelly?
There was a problem hiding this comment.
This was present before my changes ,i've just retained it.
There was a problem hiding this comment.
I wonder if we can remove it, those daemons that use swsscommon.SubscriberStateTable don't use ConfigDBConnector's wait_for_init.
There was a problem hiding this comment.
This was probably added because this script used to start very early, and the implementers wanted to wait until the CONFIG_DB is initialized/redis is up. Although, you may argue that this can be removed. But since it doesn't affect anything, i think it's better to have as a sanity check.
https://github.com/Azure/sonic-swss-common/blob/master/common/configdb.cpp#L28
| for callback in cbs: | ||
| callback(table, key, op, dict(fvs)) | ||
|
|
||
| if init_load_flag and table == "FEATURE" and key.lower() == "swss": |
There was a problem hiding this comment.
What is the purpose of this condition?
There was a problem hiding this comment.
Previously, before the listen phase was started, update_all_features_config was run followed by load . This inturn invokes the load method of AaaCfg.
With the redesign, we cannot have the manual ordering which we had previously, thus introduced this condition i.e. to basically execute the load of aaacfg after swss is started
There was a problem hiding this comment.
Why AAA config depends on FEATURE config?
There was a problem hiding this comment.
AAA/RADIUS/TACACS tables, have src_intf option which could be configured as either eth0, Loopback0 etc.
https://github.com/Azure/SONiC/blob/master/doc/aaa/radius_authentication.md#radius-table-schema
Before this change, AAA config was run after the FEATURE config is completed
So, i thought of retaining this order by configuring SWSS first and then AAA. but if you think it's safe to confiure AAA before feature config, then i can change this.
There was a problem hiding this comment.
You're saying that AAA/RADIUS/TACACS need to have an interface to work with, which could be management interface or loopback interface which is created by swss and this is why swss has to be started first and then AAA configuration processed?
If it is, I would suggest removing this condition, since it anyway does not guarantee that Loopback interface will be created at this time.
src/sonic-host-services/setup.py
Outdated
| @@ -27,7 +27,7 @@ | |||
| 'Jinja2>=2.10', | |||
| 'PyGObject', | |||
| 'sonic-py-common', | |||
| 'systemd-python', | |||
| 'systemd-python' | |||
There was a problem hiding this comment.
Haven't seen it actually in use
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
|
@stepanblyschak, Addressed suggestion and provided comments on few of them. Please review |
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
stepanblyschak
approved these changes
Sep 27, 2021
vivekrnv
pushed a commit
that referenced
this pull request
Jan 18, 2022
* [BFN] Updated platform APIs impl Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * Extended BFN platform SFP APIs implementation * Update sfp.py * [BFN] Extended SFP platform plugin implementation Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * [BFN] Extended Fans platform plugin implementation * [BFN] divided classes Fan and FanDrawer into 2 files * Signed-off-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> What I did Add get_model() function Add get_low_critical_threshold() function Change __get(...) function. How I did it Differnece from previous implementation of __get(...) function is return real value or -9999.9 if value is not provided by thrift API * Add get_presence() function and revised __get() function Signed-off-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> * [BFN] Updated PSU platform APIs impl Signed-off-by: Dmytro Lytvynenko <dmytrox.lytvynenko@intel.com> * Added BFN PSU cache (#9) Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * [BFN] Fans and Fantray platform APIs update (#7) * [BFN] Updated SFP platform APIs (#10) Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com> * [BFN] Updated platform API for thermal (#8) * Signed-off-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> * Revert "[BFN] Fans and Fantray platform APIs update (#7)" (#11) This reverts commit c62a733. * Add support health monitor system (#15) Signed-off-by: Petro Bratash <petrox.bratash@intel.com> * Update chassis.py * [BFN] Updated FANs and FAN Tray platform API (#14) * Fix fix_alignment (#17) Signed-off-by: Petro Bratash <petrox.bratash@intel.com> * [BFN] Improvement show environment (#16) * Added PSU temperature skip into platform.json (#18) Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * Do not skip psud on Newport Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * [BFN] fix fan status from Not OK to Ok (#19) * [BFN] Updated SFP platform plugin (#13) Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com> * [DPB] Fix typo for Ethernet0 2x200G[100G,40G] breakout mode (#21) Signed-off-by: Mykola Gerasymenko <mykolax.gerasymenko@intel.com> * [barefoot] Tmp fix vendor_rev (#22) Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com> * Fixed python issues in sonic_platform/fan_drawer.py Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * Updated fan_drawer.py * Fixing trailing white spaces in fan_drawer.py * [BFN] Fix thrift for SFPs API Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com> * In platform.json, replaced 'false' with '0' to workaround ast.literal_eval() issue Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * [Newport] Thermal manager (#23) * Signed-off-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> * Revert "In platform.json, replaced 'false' with '0' to workaround ast.literal_eval() issue" This reverts commit 1e73127. * Removed 'controllable' options from platform.json to fix factory default config generation Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * Update thermal_manager.py * Migrated SFP plugin to sonic_xcvr API (#30) Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> Co-authored-by: KostiantynYarovyiBf <kostiantynx.yarovyi@intel.com> Co-authored-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> Co-authored-by: Dmytro Lytvynenko <dmytrox.lytvynenko@intel.com> Co-authored-by: Volodymyr Boiko <volodymyrx.boiko@intel.com> Co-authored-by: Petro Bratash <petrox.bratash@intel.com> Co-authored-by: Mykola Gerasymenko <mykolax.gerasymenko@intel.com>
vivekrnv
pushed a commit
that referenced
this pull request
Apr 2, 2022
[sonic-linkmgrd][master] submodule update Commits added: 0c23756 Jing Zhang 2022-01-19 Linkmgrd subscribing State DB route event (#13) 12b9951 Longxiang Lyu 2021-12-13 Add TLV support to ICMP payload (#11) 3eedda3 Longxiang Lyu 2022-01-06 Add missing intermediate states (#16) 8da4982 Ying Xie 2022-01-04 [linkmgrd] update README, set coding style guidance (#15) a897cf8 Longxiang Lyu 2021-12-13 Improve PR template (#16) 6fec701 Jing Zhang 2021-12-06 Add pull request template for linkmgrd repo (#9) signed-off-by: Jing Zhang zhangjing@microsoft.com
vivekrnv
pushed a commit
that referenced
this pull request
Apr 4, 2022
[sonic-linkmgrd][master] submodule update Commits added: 0c23756 Jing Zhang 2022-01-19 Linkmgrd subscribing State DB route event (#13) 12b9951 Longxiang Lyu 2021-12-13 Add TLV support to ICMP payload (#11) 3eedda3 Longxiang Lyu 2022-01-06 Add missing intermediate states (#16) 8da4982 Ying Xie 2022-01-04 [linkmgrd] update README, set coding style guidance (#15) a897cf8 Longxiang Lyu 2021-12-13 Improve PR template (#16) 6fec701 Jing Zhang 2021-12-06 Add pull request template for linkmgrd repo (#9) signed-off-by: Jing Zhang zhangjing@microsoft.com
vivekrnv
pushed a commit
that referenced
this pull request
Oct 28, 2022
#### Why I did it Update sonic-host-services submodule to include below commits: ``` bc8698d Merge pull request #21 from abdosi/feature 557a110 Fix the issue where if dest port is not specified in ACL rule than for multi-asic where we create NAT rule to forward traffic from Namespace to host fail with exception. 6e45acc (master) Merge pull request #14 from abdosi/feature 4d6cad7 Merge remote-tracking branch 'upstream/master' into feature bceb13e Install libyang to azure pipeline (#20) 82299f5 Merge pull request #13 from SuvarnaMeenakshi/cacl_fabricns 15d3bf4 Merge branch 'master' into cacl_fabricns de54082 Merge pull request #16 from ZhaohuiS/feature/caclmgrd_external_client_warning_log b4b368d Add warning log if destination port is not defined d4bb96d Merge branch 'master' into cacl_fabricns 35c76cb Add unit-test and fix typo. 17d44c2 Made Changes to be Python 3.7 compatible 978afb5 Aligning Code 1fbf8fb Merge remote-tracking branch 'upstream/master' into feature 7b8c7d1 Added UT for the changes 91c4c42 Merge pull request #9 from ZhaohuiS/feature/caclmgrd_external_client 7c0b56a Add 4 test cases for external_client_acl, including single port and port range for ipv4 and ipv6 b71e507 Merge remote-tracking branch 'origin/master' into HEAD d992dc0 Merge branch 'master' into feature/caclmgrd_external_client bd7b172 DST_PORT is configuralbe in json config file for EXTERNAL_CLIENT_ACL f9af7ae [CLI] Move hostname, mgmt interface/vrf config to hostcfgd (#2) 70ce6a3 Merge pull request #10 from sujinmkang/cold_reset 29be8d2 Added Support to render Feature Table using Device running metadata. Also added support to render 'has_asic_scope' field of Feature Table. 3437e35 [caclmgrd][chassis]: Add ip tables rules to accept internal docker traffic from fabric asic namespaces. 8720561 Fix and add hardware reboot cause determination tests 0dcc7fe remove the empty bracket if no hardware reboot cause minor e47d831 fix the wrong expected result comparision ef86b53 Fix startswith Attribute error 8a630bb fix mock patch 8543ddf update the reboot cause logic and update the unit test 53ad7cd fix the mock patch function 7c8003d fix the reboot-cause regix for test 1ba611f fix typo 25379d3 Add unit test case a56133b Add hardware reboot cause as actual reboot cause for soft reboot failed c7d3833 Support Restapi/gnmi control plane acls f6ea036 caclmgrd: Don't block traffic to mgmt by default a712fc4 Update test cases adc058b caclmgrd: Don't block traffic to mgmt by default 06ff918 Merge pull request #7 from bluecmd/patch-1 e3e23bc ci: Rename sonic-buildimage repository e83a858 Merge pull request #4 from kamelnetworks/acl-ip2me-test f5a2e50 [caclmgrd]: Tests for IP2ME rules generation ```
vivekrnv
added a commit
that referenced
this pull request
Oct 4, 2023
* Enable iproute2 as the SDK is also built Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * [Nvidia] Dont use mkbmdeb method of dkms to build the package Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Include mft into the bookworm build Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Added linux image to the Depends section of mft Signed-off-by: Vivek Reddy <vkarri@nvidia.com> --------- Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
vivekrnv
added a commit
that referenced
this pull request
Oct 20, 2023
* Enable iproute2 as the SDK is also built Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * [Nvidia] Dont use mkbmdeb method of dkms to build the package Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Include mft into the bookworm build Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Added linux image to the Depends section of mft Signed-off-by: Vivek Reddy <vkarri@nvidia.com> --------- Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
vivekrnv
added a commit
that referenced
this pull request
Nov 7, 2023
Signed-off-by: Vivek Reddy <vkarri@nvidia.com> [Nvidia] Enable iproute2 & fix mft build (#16) * Enable iproute2 as the SDK is also built Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * [Nvidia] Dont use mkbmdeb method of dkms to build the package Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Added linux image to the Depends section of mft Signed-off-by: Vivek Reddy <vkarri@nvidia.com> [Nvidia] [Bookworm] Separate KERNEL_MFT into a new target (sonic-net#16782) * [Nvidia] Seperate KERNEL_MFT into a new target because of kernel header dependency Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Update linux-kernel submodule Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Fix paralell build problem Signed-off-by: Vivek Reddy <vkarri@nvidia.com> --------- Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
vivekrnv
added a commit
that referenced
this pull request
Nov 22, 2023
Signed-off-by: Vivek Reddy <vkarri@nvidia.com> [Nvidia] Enable iproute2 & fix mft build (#16) * Enable iproute2 as the SDK is also built Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * [Nvidia] Dont use mkbmdeb method of dkms to build the package Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Added linux image to the Depends section of mft Signed-off-by: Vivek Reddy <vkarri@nvidia.com> [Nvidia] [Bookworm] Separate KERNEL_MFT into a new target (sonic-net#16782) * [Nvidia] Seperate KERNEL_MFT into a new target because of kernel header dependency Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Update linux-kernel submodule Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Fix paralell build problem Signed-off-by: Vivek Reddy <vkarri@nvidia.com> --------- Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
vivekrnv
pushed a commit
that referenced
this pull request
Mar 18, 2024
* [build] Fix bfinstall and bootimages packages URLs. * [build] Fix issue with "bootimages" package dependencies.
vivekrnv
pushed a commit
that referenced
this pull request
Apr 2, 2024
…sonic-net#17750) #### Why I did it src/dhcpmon ``` * 2443073 - (HEAD -> 202311, origin/202311) [counter] Clear counter table when dhcpmon init (#14) (#16) (2 days ago) [Yaqiang Zhu] ``` #### How I did it #### How to verify it #### Description for the changelog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Why I did it
Fixes the issue
sonic-buildimage/issues/8619.How I did it
update_all_features_configwhich was roughly taking a 5-10 sec time to execute and thus the reason for blackoutHow to verify it
UT's:
Verified manually,
Which release branch to backport (provide reason below if selected)
Description for the changelog
A picture of a cute animal (not mandatory but encouraged)