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

[warm boot] cherry-pick PR #2538 and advance related sub-modules in 201811 branch #2569

Merged
merged 1 commit into from
Feb 14, 2019
Merged

[warm boot] cherry-pick PR #2538 and advance related sub-modules in 201811 branch #2569

merged 1 commit into from
Feb 14, 2019

Conversation

yxieca
Copy link
Contributor

@yxieca yxieca commented Feb 14, 2019

- What I did

PR#2538 cannot merge due to master branch status. However this change has been tested against 201811 branch.

Submodule src/sonic-sairedis 21f4a49..d57222a:

Add more specific logic for ingress ACL and buffer profile (#421)
Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#418)
Add support for vlan tagged frames in virtual switch (#417)

Submodule src/sonic-swss 1590030..584490c:

Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#786)
[vstest]: Potential fix for timing issue in warm_reboot's routing UT (#788)

Submodule src/sonic-swss-common 594f4e8..286ef34:

Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#260)

Submodule src/sonic-utilities c6666e2..b44b462:

Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… (#458)
[aclshow] output only counters per table/rule (#442)

Signed-off-by: Ying Xie ying.xie@microsoft.com

[PR 2538] Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE

Signed-off-by: Jipan Yang jipan.yang@alibaba-inc.com

- How to verify it
This change passed nightly test and continuous warm reboot test

@yxieca
[warm boot] cherry-pick PR sonic-net#2538 and advance related sub-mod…
09ebe42 
…ules

PR#2538 cannot merge due to master branch status. It has been tested
against 201811 branch.

Submodule src/sonic-sairedis 21f4a49..d57222a:
  > Add more specific logic for ingress ACL and buffer profile (sonic-net#421)
  > Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#418)
  > Add support for vlan tagged frames in virtual switch (sonic-net#417)

Submodule src/sonic-swss 1590030..584490c:
  > Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#786)
  > [vstest]: Potential fix for timing issue in warm_reboot's routing UT (sonic-net#788)

Submodule src/sonic-swss-common 594f4e8..286ef34:
  > Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#260)

Submodule src/sonic-utilities c6666e2..b44b462:
  > Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… (sonic-net#458)
  > [aclshow] output only counters per table/rule (sonic-net#442)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

[PR 2538] Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
@yxieca yxieca requested a review from jipanyang February 14, 2019 16:42
@yxieca yxieca mentioned this pull request Feb 14, 2019
Merged
@yxieca yxieca changed the title [warm boot] cherry-pick PR #2538 and advance related sub-modules [warm boot] cherry-pick PR #2538 and advance related sub-modules in 201811 branch Feb 14, 2019
jipanyang
jipanyang approved these changes Feb 14, 2019
View reviewed changes
Copy link
Collaborator

@jipanyang jipanyang left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@yxieca yxieca merged commit 4faa5f2 into sonic-net:201811 Feb 14, 2019
@yxieca yxieca deleted the wb-cfg branch February 14, 2019 20:13
@yxieca yxieca mentioned this pull request Dec 15, 2022
Merged
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Dec 16, 2022
@yxieca
[202205][utilities][kenerl][swss][dhcprelay][sairedis] advance submod…
e4b0e40 
…ule head

utilities:
* f40d82f 2022-12-15 | [db_migrator] Fix migration of Loopback data: handle all Loopback interfaces (sonic-net#2560) (HEAD -> 202205) [Vaibhav Hemant Dixit]
* efd2ab8 2022-12-14 | [muxcable][show] update `show mux tunnel-route` to separate ASIC and kernel into two columns (sonic-net#2553) (HEAD -> 202205) [Jing Zhang]

kernel:
* 085d8cb 2022-12-14 | Merge pull request sonic-net#303 from madhava28/cisco/kernel_config (HEAD -> 202205) [Saikrishna Arcot]

swss:
* d8e46b9 2022-12-16 | [muxorch] Skip programming ACL for standby `active-active` ports (sonic-net#2569) (HEAD -> 202205) [Longxiang Lyu]

dhcprelay:
* 9b30690 2022-12-17 | fix handleSwssNotification crash in dhcp6relay (sonic-net#28) (HEAD, github/master) [jcaiMR]

sairedis:
* abe242a 2022-12-16 | Manage LANES mapping on VOQ system (sonic-net#1127) (HEAD -> 202205) [Bohan Yang]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
vivekrnv added a commit to vivekrnv/sonic-buildimage that referenced this pull request Dec 17, 2022
@vivekrnv
Update sonic-swss ptr
cbdba5a 
6185324 dereg acl-rule counters during acl-table del (sonic-net#2574)
b865352 Align watermark flow with port configuration (sonic-net#2525)
f2d2fb3 L3 / L3 V6  Egress ACL table creation failure (sonic-net#2561)
577f696 [muxorch] Skip programming ACL for standby `active-active` ports (sonic-net#2569)
242ee11 [muxorch] Skip programming SoC IP kernel tunnel route (sonic-net#2557)
6695113 [gearbox] Support setting tx taps on gearbox ports (sonic-net#2158)
872f7bf [portinit] Do not call GET on SAI_PORT_ATTR_SPEED when AUTONEG is enabled (sonic-net#2484)
6afefe1 [vstest][virtual chassis] Removed dvs.runcmd using click commands (sonic-net#2214)
b8521cc [p4orch]: PINS Extension tables support (sonic-net#2506)
d0419dc sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (sonic-net#2552)
bd652a0 [muxorch] Adding case for maintaining current state (sonic-net#2280)
6b6dda6 [Centec]for support mclag of centec to configure port isolate-group sonic-net#2529
ec507a4 [ACL] Support ACTION_COUNTER action in custom ACL table type (sonic-net#2550)
1a74604 Use github code scanning instead of LGTM (sonic-net#2546)
bc3c894 [dual-tor] add missing SAI attribte in order to create IPNIP tunnel (sonic-net#2503)
dca78d8 (origin/202211) [Fdbsyncd] Bug Fix for remote MAC move to local MAC and Fix for Static MAC advertisement in EVPN. (sonic-net#2521)

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
yxieca added a commit that referenced this pull request Dec 17, 2022
@yxieca
[202205][utilities][kenerl][swss] advance submodule head (#13075)
1f677f5 
utilities:
* efd2ab8 2022-12-14 | [muxcable][show] update `show mux tunnel-route` to separate ASIC and kernel into two columns (#2553) (HEAD -> 202205) [Jing Zhang]

kernel:
* 085d8cb 2022-12-14 | Merge pull request #303 from madhava28/cisco/kernel_config (HEAD -> 202205) [Saikrishna Arcot]

swss:
* d8e46b9 2022-12-16 | [muxorch] Skip programming ACL for standby `active-active` ports (#2569) (HEAD -> 202205) [Longxiang Lyu]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
liat-grozovik pushed a commit that referenced this pull request Dec 20, 2022
@vivekrnv
[submodule] Advance sonic-swss pointer (#12970)
8d04195 
6185324 dereg acl-rule counters during acl-table del (#2574)
b865352 Align watermark flow with port configuration (#2525)
f2d2fb3 L3 / L3 V6  Egress ACL table creation failure (#2561)
577f696 [muxorch] Skip programming ACL for standby `active-active` ports (#2569)
242ee11 [muxorch] Skip programming SoC IP kernel tunnel route (#2557)
6695113 [gearbox] Support setting tx taps on gearbox ports (#2158)
872f7bf [portinit] Do not call GET on SAI_PORT_ATTR_SPEED when AUTONEG is enabled (#2484)
6afefe1 [vstest][virtual chassis] Removed dvs.runcmd using click commands (#2214)
b8521cc [p4orch]: PINS Extension tables support (#2506)
d0419dc sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (#2552)
bd652a0 [muxorch] Adding case for maintaining current state (#2280)
6b6dda6 [Centec]for support mclag of centec to configure port isolate-group #2529
ec507a4 [ACL] Support ACTION_COUNTER action in custom ACL table type (#2550)
1a74604 Use github code scanning instead of LGTM (#2546)
bc3c894 [dual-tor] add missing SAI attribte in order to create IPNIP tunnel (#2503)
dca78d8 (origin/202211) [Fdbsyncd] Bug Fix for remote MAC move to local MAC and Fix for Static MAC advertisement in EVPN. (#2521)
@StormLiangMS StormLiangMS mentioned this pull request Dec 30, 2022
Merged
8 tasks
StormLiangMS added a commit that referenced this pull request Jan 14, 2023
@StormLiangMS
[submodule advance] advance sonic-utilities submodule for 202211 branch
542c47c 
#13202

advance sonic-utilities submodule for 202211 branch

34428157 - (HEAD, origin/202211) Revert "Optimize the execution time of the 'show techsupport' script to 5-10%, (Qos config change #2504)" (6 days ago) [stormliang]
c3bd01f6 - Revert "[generate_dump] Optimize the execution time of 'show techsupport' CLI by parallel function execution ([201811][Devices] Add new device CIG CS6436-56P #2512)" (6 days ago) [stormliang]
5a326d8b - [Mellanox] Change severity to NOTICE in Mellanox buffer migrator when unable to fetch DEVICE_METADATA due to empty CONFIG_DB during initialization ([warm boot] cherry-pick PR #2538 and advance related sub-modules in 201811 branch #2569) (2 weeks ago) [Stephen Sun]
50b36ef3 - Fix issue: unconfigured PGs are displayed in watermarkstat ([docker-lldp]: fix several issues in lldpd docker #2556) (2 weeks ago) [Stephen Sun]
a9fd2a79 - [Command Ref] Add doc for syslog rate limit ([sub module] move sairedis and swss to 201811 branch #2508) (2 weeks ago) [Junchao-Mellanox]
80546ff3 - [generate_dump] Optimize the execution time of 'show techsupport' CLI by parallel function execution ([201811][Devices] Add new device CIG CS6436-56P #2512) (2 weeks ago) [Vadym Hlushko]
6649ca8a - [timer.unit.j2] use wanted-by in timer unit ([201803] [services] Restart SwSS service upon unexpected critical process exit #2546) (2 weeks ago) [Stepan Blyshchak]
dd23d0ef - Fixes [Sub-If|VRF] Unbind sub-interface from VRF is failed #12170: Delete subinterface and recreate the subinterface in ([VLAN] "show mac" doesn't work when interface added to vlan as tagged member #2513) (2 weeks ago) [Preetham]
236749d3 - [db_migrator] Fix migration of Loopback data: handle all Loopback interfaces (DellEMC S6000 xcvrd support #2560) (2 weeks ago) [Vaibhav Hemant Dixit]
5762d814 - Optimize the execution time of the 'show techsupport' script to 5-10%, (Qos config change #2504) (2 weeks ago) [Vadym Hlushko]
d3c3e368 - [muxcable][show] update show mux tunnel-route to separate ASIC and kernel into two columns (build errors on branch 201811 for centec platform #2553) (2 weeks ago) [Jing Zhang]
c98648a1 - [show]Fix show route return code on error (Dell SMF driver hwmon number reorder fix for Dell S6100/Z9100 #2542) (2 weeks ago) [Sudharsan Dhamal Gopalarathnam]
01374673 - [route_check]: Ignore ASIC only SOC IPs (Added new SN3700/SN3700C Mellanox platforms #2548) (2 weeks ago) [Lawrence Lee]
d2967805 - YANG Validation for ConfigDB Updates: WARM_RESTART, SFLOW_SESSION, SFLOW, VXLAN_TUNNEL, VXLAN_EVPN_NVO, VXLAN_TUNNEL_MAP, MGMT_VRF_CONFIG, CABLE_LENGTH, VRF tables ([submodule 201811] advance sairedis and swss submodule for 201811 branch #2526) (2 weeks ago) [isabelmsft]
88b01ffd - [db_migrator] Remove import of swsssdk as it is not supported in master ([build]: apply proxy setting to curl. #2544) (2 weeks ago) [Vaibhav Hemant Dixit]
4ae970c6 - Support syslog rate limit configuration for containers and host (Move FRR from 4.0 to 6.0.2 and make new frr version and pkg compile #2454) (2 weeks ago) [Junchao-Mellanox]
608ed147 - [generate_dump] [Mellanox] Fix the duplicate dfw dump collection problem by adding symlinks ('show vlan config' is not displaying the VLAN members, after the clear config and reload with default l2 configuration. #2536) (2 weeks ago) [Vivek]
bdc2599f - [config] Add check in config interface ip command to block if the interface is portchannel member ([sub module] advance sonic-swss sub module #2539) (2 weeks ago) [Sudharsan Dhamal Gopalarathnam]
cff4fed5 - [system-health] Improve code structure of system health CLIs ([sub-module] advance sonic-swss sub-module #2453) (2 weeks ago) [Junchao-Mellanox]
488e5714 - Transceiver eeprom dom CLI modification to show output from TRANSCEIVER_DOM_THRESHOLD table (Fix for KeyError: 'DEVICE_NEIGHBOR' when executing 'show interfaces neighbor expected' command #2535) (2 weeks ago) [mihirpat1]
07ca5def - sonic-utilities: Update config reload() to verify formatting of an input file ([ntp]: Do not disable reader for error ENOBUFS #2529) (2 weeks ago) [Caitlin Choate]
f0f083a2 - [GCU] Add RemoveCreateOnlyDependency Validator/Generator (Enabling Fast-reboot command in s6100 loaded with T0 topo getting Failed unmounting /host error #2500) (2 weeks ago) [jingwenxie]
eca0253c - [QoS] Introduce delay to the qos reload flow (Config reload/load_minigraph not clearing State DB #2503) (2 weeks ago) [DavidZagury]
35158ee0 - Use github code scanning instead of LGTM ([sub module] sub module sonic-swss-common tracking 201811 branch #2530) (2 weeks ago) [Liu Shilong]
682b5cee - Change show kube command default value of insecure key to True ([submodule] update sonic-snmpagent #2517) (2 weeks ago) [lixiaoyuner]
ce19e631 - Add db_migrator_constants.py script to setup.py (Add device data for Arista 7060PX/DX4-32 #2534) (2 weeks ago) [Vaibhav Hemant Dixit]
0d0c2693 - [drop counters] Fix CLI script for unconfigured PGs ([config] Do not fail for minigraphs which do not have neighbors listed in <Devices> section #2518) (2 weeks ago) [Lior Avramov]
2c69d0fd - Update vrf add, del commands for duplicate/non-existing VRFs (solve package build dependency issue #2467) (2 weeks ago) [Muhammad Danish]
efc09280 - Port 202012 DB migration changes to newer branches ([vs]: Force10-S6000 buffer settings for virtual switch #2515) (2 weeks ago) [Vaibhav Hemant Dixit]
70a15aaa - [VXLAN]Fixing traceback in show remotemac when mac moves during command execution ([build] When generating image version, handle case where current commit has no reachable tags #2506) (2 weeks ago) [Sudharsan Dhamal Gopalarathnam]
mihirpat1 pushed a commit to mihirpat1/sonic-buildimage that referenced this pull request Jun 14, 2023
@lolyu
[muxorch] Skip programming ACL for standby active-active ports (son…
577f696 
…ic-net#2569)

What I did
Skip adding ACL for active-active ports.

Why I did it
Please refer to the HLD for more details: sonic-net/SONiC#1180

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
mssonicbld added a commit that referenced this pull request Jul 12, 2023
@mssonicbld
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
1efaedb 
…lly (#15796)

#### Why I did it
src/sonic-swss
```
* 0ec46f22 - (HEAD -> 202211, origin/202211) [muxorch] Skip programming ACL for standby `active-active` ports (#2569) (#2854) (7 hours ago) [Longxiang Lyu]
```
#### 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
Reviewers

@jipanyang jipanyang jipanyang approved these changes

Assignees
No one assigned
Labels
Included in 201811 Branch Request for 201811 Branch :shipit: Submodule Update ⏫
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yxieca @jipanyang