Skip to content

[pull] master from Azure:master#1633

Merged
pull[bot] merged 10 commits intomudsut4ke:masterfrom
sonic-net:master
Jun 30, 2021
Merged

[pull] master from Azure:master#1633
pull[bot] merged 10 commits intomudsut4ke:masterfrom
sonic-net:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Jun 30, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

stephenxs and others added 10 commits June 29, 2021 17:30
Advance submodule head for sonic-swss

3226163 [BufferOrch] Don't call SAI API for BUFFER_POOL/PROFILE handling in case the op is DEL and the SAI OID is NULL (sonic-net/sonic-swss#1786)
6c88e47 [Dynamic Buffer Calc][Mellanox] Bug fixes and enhancements for the lua plugins for buffer pool calculation and headroom checking (sonic-net/sonic-swss#1781)
e86b900 [MPLS] sonic-swss changes for MPLS (sonic-net/sonic-swss#1686)
4c8e2b5 [Dynamic Buffer Calc] Avoid creating lossy PG for admin down ports during initialization (sonic-net/sonic-swss#1776)
3602124 [VS test stability] Skip flaky test for DPB (sonic-net/sonic-swss#1807)
c37cc1c Support for in-band-mgmt via management VRF (sonic-net/sonic-swss#1726)
1e3a532 Fix config prompt question issue (sonic-net/sonic-swss#1799)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
Before this change, a process running inside every SONiC container dealt with FEATURE table 'auto_restart' field and depending on the value decided whether a container has to be killed or not.
If killed service auto restart mechanism restarts the container.
This change moves the logic from container to the host daemon - hostcfgd.
The 'auto_restart' handling is kept in supervisor-proc-exit-listener but now it is not required for container that wants to support auto restart feature.

hostcfgd refactoring - move feature handling in another class.
override systemd service Restart= setting from hostcfgd.
remove default systemd Restart=always.
Signed-off-by: Stepan Blyshchak stepanb@nvidia.com

- Why I did it

Remove the need to deal with container orchestration logic from the container itself. Leave this logic to the orchestrator - host OS.

- How I did it

hostcfgd configures 'Restart=' value for systemd service.

- How to verify it

root@r-tigon-11:/home/admin# sudo config feature autorestart lldp enabled
root@r-tigon-11:/home/admin# show feature status | grep lldp
lldp            enabled   enabled
root@r-tigon-11:/home/admin# docker exec -it lldp pkill -9 lldpd
root@r-tigon-11:/home/admin# docker ps -a | grep lldp
65058396277c        docker-lldp:latest                   "/usr/bin/docker-lld…"   2 days ago          Exited (0) 20 seconds ago                       lldp
root@r-tigon-11:/home/admin# docker ps -a | grep lldp
65058396277c        docker-lldp:latest                   "/usr/bin/docker-lld…"   2 days ago          Up 5 seconds                            lldp
root@r-tigon-11:/home/admin# sudo config feature autorestart lldp disabled
root@r-tigon-11:/home/admin# docker exec -it lldp pkill -9 lldpd
root@r-tigon-11:/home/admin# docker ps -a | grep lldp
65058396277c        docker-lldp:latest                   "/usr/bin/docker-lld…"   2 days ago          Up 35 seconds                           lldp
root@r-tigon-11:/home/admin# docker ps -a | grep lldp
65058396277c        docker-lldp:latest                   "/usr/bin/docker-lld…"   2 days ago          Exited (0) 3 seconds ago                       lldp
root@r-tigon-11:/home/admin# docker ps -a | grep lldp
65058396277c        docker-lldp:latest                   "/usr/bin/docker-lld…"   2 days ago          Exited (0) 39 seconds ago                       lldp
root@r-tigon-11:/home/admin#
Signed-off-by: Stepan Blyschak stepanb@mellanox.com

Why I did it
To support building DHCP relay as extension and installing it during build time.

How I did it
Created infrastructure. Users need to define their packages in rules/sonic-packages.mk

How to verify it
Together with #6531
* SONiC Yang model support for COPP
* Tables: COPP_GROUP, COPP_TRAP.
Remove the references to file monit_syncd from docker-syncd-brcm-dnx, which got missed as the PR #7598 overlapped #7676
Why I did it
To determine the revision of the pcie.yaml to be used based on BIOS version in DellEMC S6100 platform.

Depends on: sonic-net/sonic-platform-common#195

How I did it
Added two revisions of pcie.yaml pcie_1.yaml and pcie_2.yaml
Included a platform-specific Pcie class to provide the revision of the pcie.yaml to be used by pcieutil/pcied.
How to verify it
Execute pcieutil check (sonic-net/sonic-utilities#1672) command and verify the list of PCIe devices displayed.
Logs: UT_logs.txt
… docker (#7469)" (#8023)

This change causes nightly test to fail due to the fake proxy IP is not reachable.

Reverts #7469

This reverts commit f7ed82f.
Add checkbox for backport request to 202106 branch to PR template
…forms. (#8002)

Why I did it

We hit an issue recently in the chassis bringup where the linux bde attach failed with the following ioctl error.
[ 9058.585960] linux-user-bde (897363): Error: Invalid ioctl (00004c1d)
[ 9105.668237] linux-user-bde (901002): Error: Invalid ioctl (00004c1d)

Debugged with Broadcom team, who suggested to use this flag BCM_INSTANCE_SUPPORT to support multi-instance scenarios ( platforms with more than one asic where there are separate sai/syncd docker instances running controller each asic instance).

This flag was introduced since SDK-6.5.21 and need to be present in SAI and SAI GPL kernel module makefile.

How I did it

Add the flag in this flag BCM_INSTANCE_SUPPORT in gpl modules
Why I did it
Multiple build failed in 202012 branch
It is caused by the disorder of the package urls retrieved from the command "apt-get download --print-urls "
@pull pull bot added the ⤵️ pull label Jun 30, 2021
@pull pull bot merged commit 9d66b61 into mudsut4ke:master Jun 30, 2021
pariwat pushed a commit to pariwat/sonic-buildimage that referenced this pull request Sep 10, 2021
Update sonic-sairedis submodule and also update sonic-swss submodule as there are interdependent changes.

* src/sonic-sairedis 13474d1...bc58b0f (12):
  > Add gbsyncdmgrd; deprecate gbsyncd_startup.py (mudsut4ke#809)
  > Remove gbsyncd_start.sh (mudsut4ke#808)
  > [gbsyncd] Fix shebang in gbsyncd_startup.py; Make script executable (mudsut4ke#807)
  > [saiasiccmp] Add saiasiccmp tool to compare 2 asic views (mudsut4ke#791)
  > [configure] Add -Wno-psabi to remove "passing argument changed in GCC 7.1" (mudsut4ke#799)
  > Update FlexCounter.cpp, use m_pollInterval in MUTEX lock (mudsut4ke#797)
  > [vs] Add special warm boot logic to populate default attributes (mudsut4ke#796)
  > [ci]: add vstest (mudsut4ke#795)
  > [tests] Add macsec unittest (mudsut4ke#782)
  > [debian/control] libsairedis-dev depends on libzmq5-dev (mudsut4ke#794)
  > [ci]: use build template (mudsut4ke#793)
  > Rename duplicate file name (mudsut4ke#773)

* src/sonic-swss 0b0d24c...5adb73e (47):
  > Initialize system port type variable (mudsut4ke#1681)
  > [Dynamic Buffer Calc] Enhance the field checking in table handling (mudsut4ke#1680)
  > Handle the clear request for 'Q_SHARED_ALL' (mudsut4ke#1653)
  > [MuxOrch] FDB ageout safety check (mudsut4ke#1674)
  > Deactivate mirror session only when session status is true in updateLagMember (mudsut4ke#1666)
  > Revert "[buffermgr] Support maximum port headroom checking (mudsut4ke#1607)" (mudsut4ke#1675)
  > reduce severity of log to info in case of flush on non-existing member (mudsut4ke#1669)
  > Revert "[Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (mudsut4ke#1652)" (mudsut4ke#1676)
  > [Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (mudsut4ke#1652)
  > [acl] Move ACL table constants to acltable.h (mudsut4ke#1671)
  > [nbrmgrd] added function to parse IP address from APP_DB (mudsut4ke#1672)
  > [MUX/PFCWD] Use in_ports for acls instead of seperate ACL table (mudsut4ke#1670)
  > [vog/systemlag] Voq lagid allocator (mudsut4ke#1603)
  > Add table descriptions for dynamic buffer calculation to the documents (mudsut4ke#1664)
  > [vstest/subintf] Add vs test case to validate processing sequence of APPL DB keys (mudsut4ke#1663)
  > Remove vxlanmgrd dependency on orchagent (mudsut4ke#1647)
  > Keep attribute order in bulk mode (mudsut4ke#1659)
  > [mux] VS test for neigh, route and fdb (mudsut4ke#1656)
  > [linksync] Netdev oper status determination using IFF_RUNNING (mudsut4ke#1568)
  > [portorch] parse on/off value from autoneg (mudsut4ke#1658)
  > [intfsorch] Create subport with the entry contains necessary attributes (mudsut4ke#1650)
  > [ci]: Purge swss before install (mudsut4ke#1654)
  > Update StateDB with error if state change failed, Update APP_DB in all state chg req (mudsut4ke#1662)
  > Added changes to handle dependency check in FdbSyncd and FpmSyncd for warm-boot (mudsut4ke#1556)
  > [synchronous mode] Add failure notification for SAI failures in synchronous mode (mudsut4ke#1596)
  > [acl] Enable VLAN ID qualifier for ACL rules (mudsut4ke#1648)
  > Updated PFCWD to use single ACL table for PFCWD and MUX (mudsut4ke#1620)
  > [orchagent] Increase SAI REDIS response timeout to support FW upgrade during init (Mellanox only). (mudsut4ke#1637)
  > [vstest/nhg]: use dvs_route fixture to make test_nhg more robust
  > [vstest]: add dvs_route fixture
  > [vstest/subintf] Update vs tests to validate physical port host interface vlan tag attribute (mudsut4ke#1634)
  > Remove useless header  in macsecorch (mudsut4ke#1628)
  > Add SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter, create new FlexCounter group (mudsut4ke#1600)
  > fixed unsupported resource issue (mudsut4ke#1641)
  > [test_virtual_chassis]: use wait_for to make test more robust (mudsut4ke#1640)
  > spell check fixes (mudsut4ke#1630)
  > [bufferorch] Handle NOT IMPLEMENTED status returned during set attr operation (mudsut4ke#1639)
  > [ci]: run vstest
  > [test_virtual_chassis]: use wait_for function to improve test robustness
  > [Mux] Neighbor handling based on FDB entry (mudsut4ke#1631)
  > [ci]: use build template (mudsut4ke#1633)
  > Log level change from ERR to INFO for fetch systemports issue (mudsut4ke#1632)
  > Migrate serdes programming to port serdes object (mudsut4ke#1611)
  > [tests] Remove legacy saiattributelist.h dependency (mudsut4ke#1608)
  > [buffermgr] Support maximum port headroom checking (mudsut4ke#1607)
  > Support shared headroom pool on top of dynamic buffer calculation (mudsut4ke#1581)
  > Fix the compiling errors in gcc9 (mudsut4ke#1621)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants