[sonic-installer] Fix an issue that old config is not preserved in aboot image upgrade#122
Merged
taoyl-ms merged 1 commit intosonic-net:masterfrom Oct 6, 2017
Merged
Conversation
…oot image upgrade
lguohan
approved these changes
Oct 6, 2017
stepanblyschak
pushed a commit
to stepanblyschak/sonic-utilities
that referenced
this pull request
Apr 28, 2022
…onic-net#4193) * [Mellanox]Integrate hw-mgmt 7.0000.3012 * [sonic-linux-kernel]Advance the submodule head Advance the sonic-linux-kernel [sFlow]: Patch to fix skb_over_panic in psample driver (sonic-net#120) Added support in the kernel for fullcone 3-tuple unique nat. (#100) Adding support to compile ARM architecture (#102) [ixgbe] Support bcm54616s external phy in ixgbe (sonic-net#122) Fix i2c ISMT DMA buffer alignment issue (sonic-net#123) [mellanox]: Add SN4700 patches. (sonic-net#126)
stepanblyschak
pushed a commit
to stepanblyschak/sonic-utilities
that referenced
this pull request
Apr 28, 2022
following PR's : Implement cbgpPeer2State in CiscoBgp4MIB (sonic-net#119) Fix index nodes in LLDP tables whose access right is not-accessible. (sonic-net#112) Fix quagga/FRR parser on IPv6 BGP sessions (sonic-net#122) [lint] Fix some syntax errors or warnings (sonic-net#127) Update README.md: Add lgtm badges (sonic-net#128) [Multi-asic]: Support multi-asic platform (sonic-net#126) Simplify test code (sonic-net#132) [Multi-asic]: Namespace support for LLDP and Sensor tables (sonic-net#131) Fix undefined variable and warning message (sonic-net#134) Fix SNMP AgentX socket connection timeout when using Namespace.get_all() (sonic-net#140) [Namespace] Fix interfaces counters in InterfacesMIB RFC 2863 (sonic-net#141) Fix LGTM reported alert of PR#141 (sonic-net#142)
cyw233
pushed a commit
to cyw233/sonic-utilities
that referenced
this pull request
Mar 2, 2026
…#122) This reverts commit 2866ccd. <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "closes #xxxx", "fixes #xxxx" or "resolves #xxxx" so that GitHub automatically closes the related issue when the PR is merged. If you are adding/modifying/removing any command or utility script, please also make sure to add/modify/remove any unit tests from the tests directory as appropriate. If you are modifying or removing an existing 'show', 'config' or 'sonic-clear' subcommand, or you are adding a new subcommand, please make sure you also update the Command Line Reference Guide (doc/Command-Reference.md) to reflect your changes. Please provide the following information: --> After PFCWD is enabled on backplane in sonic-net#3759, qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXoffLimit[single_dut_multi_asic-xoff_1] and all non single-asic cases failed with the following error: ``` ====================================================================== ERROR: sai_qos_tests.PFCtest ---------------------------------------------------------------------- Traceback (most recent call last): File "saitests/py3/sai_qos_tests.py", line 1789, in runTest pkt, int(self.test_params['pg']), asic_type, pkts_num_egr_mem) File "saitests/py3/sai_qos_tests.py", line 582, in fill_leakout_plus_one asic_type, int(pkts_num_egr_mem)) File "saitests/py3/sai_qos_tests.py", line 626, in fill_egress_plus_one pkts_num_egr_mem + max_packets, pg_cntrs_base[queue], pg_cntrs[queue])) RuntimeError: fill_egress_plus_one: Failure, sent 7884 packets, SQ occupancy bytes rose from 0 to 0 ---------------------------------------------------------------------- ``` as egress port is tx_disabled, PFC is generated from egress port back to backplane and triggered pfcwd on supervisor card. hence resulting in packet drop. ``` admin@sonic-sup-1:~$ show pfcwd stat -d all QUEUE STATUS STORM DETECTED/RESTORED TX OK/DROP RX OK/DROP TX LAST OK/DROP RX LAST OK/DROP ----------------- ----------- ------------------------- ------------- ------------ ----------------- ----------------- Ethernet-BP448:3 operational 11/11 35404/1018833 0/0 0/8880 0/0 Ethernet-BP2240:3 operational 2/2 3601/980808 0/0 3601/979813 0/0 Ethernet-BP2240:4 operational 1/1 0/997 0/0 0/997 0/0 Ethernet-BP2244:3 operational 2/2 7465/1990 0/0 2055/995 0/0 Ethernet-BP2244:4 operational 1/1 1/994 0/0 1/994 0/0 Ethernet-BP4560:3 operational 1/1 968/989 0/0 968/989 0/0 Ethernet-BP4560:4 operational 1/1 1/983 0/0 1/983 0/0 Ethernet-BP4564:3 operational 2/2 12/1974 0/0 7/988 0/0 Ethernet-BP4564:4 operational 1/1 7/982 0/0 7/982 0/0 admin@sonic-sup-1:~$ ``` #### What I did Reverted back PR sonic-net#3759 #### How I did it Reverted back PR sonic-net#3759 #### How to verify it PFCtest passed after applying the patch manually. Full test_qos_sai is still running. will upload the result once it is done. ``` (Pdb) c fill_egress_plus_one: Success, sent 6941 packets, SQ occupancy bytes rose from 0 to 1536 after send packets short of triggering PFC: recv_counters [0, 48251, 0, 0, 0, 1166406, 494656, 0, 0, 0, 21711040893, 1345, 48251, 0, 3019568, 1981, 0, 0] recv_counters_base [0, 48251, 0, 0, 0, 1166406, 494656, 0, 0, 0, 21700549309, 1344, 48251, 0, 3009234, 1980, 0, 0] xmit_counters [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21763613747, 40252, 0, 0, 2352, 998, 0, 0] xmit_counters_base [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21752352307, 40245, 0, 0, 2351, 998, 0, 0] after send a few packets to trigger PFC: recv_counters [0, 48251, 0, 0, 0, 1238602, 494656, 0, 0, 0, 21717895805, 1345, 48251, 0, 3019609, 1981, 0, 0] recv_counters_base [0, 48251, 0, 0, 0, 1166406, 494656, 0, 0, 0, 21711040893, 1345, 48251, 0, 3019568, 1981, 0, 0] xmit_counters [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21769594355, 40252, 0, 0, 2352, 999, 0, 0] xmit_counters_base [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21752352307, 40245, 0, 0, 2351, 998, 0, 0] after send packets short of ingress drop: recv_counters [0, 48251, 0, 0, 0, 1359193, 494656, 0, 0, 0, 21723777533, 1345, 48251, 0, 3019857, 1982, 0, 0] recv_counters_base [0, 48251, 0, 0, 0, 1238602, 494656, 0, 0, 0, 21717895805, 1345, 48251, 0, 3019609, 1981, 0, 0] xmit_counters [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21776005939, 40252, 0, 0, 2353, 999, 0, 0] xmit_counters_base [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21752352307, 40245, 0, 0, 2351, 998, 0, 0] after send a few packets to trigger drop: recv_counters [0, 48272, 0, 0, 0, 1459846, 494656, 0, 0, 0, 21729769085, 1346, 48272, 0, 3019898, 1982, 0, 0] recv_counters_base [0, 48251, 0, 0, 0, 1359193, 494656, 0, 0, 0, 21723777533, 1345, 48251, 0, 3019857, 1982, 0, 0] xmit_counters [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21781582707, 40252, 0, 0, 2354, 999, 0, 0] xmit_counters_base [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21752352307, 40245, 0, 0, 2351, 998, 0, 0] ok ---------------------------------------------------------------------- Ran 1 test in 65.702s OK ``` #### Previous command output (if the output of a command-line utility has changed) #### New command output (if the output of a command-line utility has changed)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.