Skip to content

[dualtor-io] Fix duplication merge condition#18828

Merged
yxieca merged 1 commit intosonic-net:masterfrom
lolyu:fix_merge_cond
Jun 6, 2025
Merged

[dualtor-io] Fix duplication merge condition#18828
yxieca merged 1 commit intosonic-net:masterfrom
lolyu:fix_merge_cond

Conversation

@lolyu
Copy link
Collaborator

@lolyu lolyu commented Jun 5, 2025 •
edited
Loading

Description of PR

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505

Approach

What is the motivation for this PR?

Work Item: 33161844

Fix the dualtor_io.test_link_failure.test_active_link_down_downstream_active_soc[active-active] failure:

Failed: 
Traffic to server 192.168.0.15 was disrupted 2 times. Allowed number of disruptions: 1

The server 192.168.0.15 I/O result shows that there are two disruptions:

01/06/2025 15:06:12 dual_tor_io.examine_flow                 L0740 INFO   | Server 192.168.0.15 results:
{
    "sent_packets": 652,
    "received_packets": 650,
    "disruption_before_traffic": false,
    "disruption_after_traffic": false,
    "duplications": [],
    "disruptions": [
        {
            "start_time": 1748790187.24364,
            "end_time": 1748790187.772263,
            "start_id": 70,
            "end_id": 72
        },
        {
            "start_time": 1748790187.772263,
            "end_time": 1748790188.304254,
            "start_id": 72,
            "end_id": 74
        }
    ]
}

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

Signed-off-by: Longxiang Lyu [email protected]

How did you do it?

Change the merge condition to allow merge in this case.

How did you verify/test it?

Run on Cisco dualtor testbed and pass.

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@mssonicbld
Copy link
Collaborator

mssonicbld commented Jun 5, 2025

/azp run

@lolyu lolyu requested a review from yxieca June 5, 2025 11:42
@azure-pipelines
Copy link

azure-pipelines bot commented Jun 5, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@lolyu lolyu requested a review from bingwang-ms June 5, 2025 11:42
@yxieca yxieca merged commit 346d409 into sonic-net:master Jun 6, 2025
20 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Jun 6, 2025
@lolyu @mssonicbld
[dualtor-io] Fix duplication merge condition (sonic-net#18828)
c307aa7 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
@mssonicbld
Copy link
Collaborator

mssonicbld commented Jun 6, 2025

Cherry-pick PR to 202411: #18840

@mssonicbld mssonicbld mentioned this pull request Jun 6, 2025
Merged
11 tasks
mssonicbld pushed a commit that referenced this pull request Jun 6, 2025
@lolyu @mssonicbld
[dualtor-io] Fix duplication merge condition (#18828)
0bfc7a8 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Jun 6, 2025
@lolyu @mssonicbld
[dualtor-io] Fix duplication merge condition (sonic-net#18828)
5647477 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
@mssonicbld
Copy link
Collaborator

mssonicbld commented Jun 6, 2025

Cherry-pick PR to 202505: #18850

@mssonicbld mssonicbld mentioned this pull request Jun 6, 2025
Merged
11 tasks
mssonicbld pushed a commit that referenced this pull request Jun 6, 2025
@lolyu @mssonicbld
[dualtor-io] Fix duplication merge condition (#18828)
0050cbe 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
sdszhang pushed a commit to sdszhang/sonic-mgmt that referenced this pull request Jun 14, 2025
@r12f
[202412] Code sync sonic-net/sonic-mgmt:202411 => 202412 (sonic-net#382)
6989a9b 
Code sync sonic-net/sonic-mgmt:202411 => 202412

```
*   1f86dab (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250610:2314 - Merge remote-tracking branch 'base/202411' into code-sync-202412
|\
| * 2ba104e (base/202411) xwjiang-ms 250610:1604 - [202411] Use ceos 4.32.5M as default ceos image version (sonic-net#18878)
| * 5fa5cda Longxiang Lyu 250610:0818 - [202411][dualtor-aa] Add `dualtor_aa` support to `test_nvgre_hash` (sonic-net#18883)
| * afecbbf zitingguo-ms 250609:1334 - [Cherry-pick][ACL] Collect all upstream ports and Include service port into upstream neighbors in ACL tests (sonic-net#18847)
| * 2e4247b pragnya-arista 250609:0632 - [202411][sonic-mgmt]Fix decap/test_subnet_decap.py::test_vlan_subnet_decap (sonic-net#18778)
| * 0bfc7a8 Longxiang Lyu 250606:0943 - [dualtor-io] Fix duplication merge condition (sonic-net#18828)
| * 52d3771 Zhaohui Sun 250605:2046 - Restore configuration after vxlan module (sonic-net#18714)
| * 3d0922f Yaqiang Zhu 250605:2259 - [202411][pktgen] Skip test_pktgen in m0/mx/m1 (sonic-net#18822)
| * 3de20a6 Zhaohui Sun 250516:1325 - Add secondary subnet config for t0 topologies (sonic-net#18399)
| * bb3e0f9 Zhaohui Sun 250605:1416 - Xfail test_dir_bcast.py due to known issue on Broadcom platform (sonic-net#18787)
| * 158c562 Justin Wong 250604:2058 - Add snmp lldp state check after config_reload (sonic-net#18805)
| * e39c891 eyakubch 250605:0415 - bug: added fast reboot into reboot_type check (sonic-net#18551)
| * 8c7dd3b Cong Hou 250604:1433 - Remove the skip/xfail for the dualtor_io link failure test (sonic-net#18712)
| * 5dbc53d mssonicbld 250604:0952 - [dualtor-io] fix dualtor sniffer start slow issue (sonic-net#18758) (sonic-net#18776)
| * 105cdf6 StormLiangMS 250603:0844 - [CRM AVAILABLE] To enhance the crm tests for TD3 and Cisco devices (sonic-net#18733)
| * 4251b38 andywongarista 250601:1828 - Add restore_image fixture to test_multi_hop_upgrade_path (sonic-net#18230) (sonic-net#18532)
| * 85a55d8 Longxiang Lyu 250528:2313 - [dualtor] Fix `test_orchagent_slb` (sonic-net#18666)
| * 95a8764 Vivek Verma 250227:0656 - Fix fixture invocation order in qos_sai_base.py to prevent teardown failure. (sonic-net#17180)
| * 9a72265 Justin Wong 250514:1844 - Add PTF parameter for ceos neighbor lacp multiplier (sonic-net#18215)
| * cd1375d Longxiang Lyu 250529:1029 - [dualtor-io] Validate and recover active-active setup (sonic-net#18675)
| * 763c1b3 Longxiang Lyu 250528:2314 - [dualtor] Fix loganalyzer not exist issue (sonic-net#18674)
```
nissampa pushed a commit to nissampa/sonic-mgmt_dpu_test that referenced this pull request Aug 7, 2025
@lolyu @nissampa
[dualtor-io] Fix duplication merge condition (sonic-net#18828)
6c1c824 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
@lolyu
[dualtor-io] Fix duplication merge condition (sonic-net#18828)
c8ccdc6 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
@lolyu @AharonMalkin
[dualtor-io] Fix duplication merge condition (sonic-net#18828)
6ffe945 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
Signed-off-by: Aharon Malkin <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
@lolyu @gshemesh2
[dualtor-io] Fix duplication merge condition (sonic-net#18828)
c6dc931 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
@lolyu @venu-nexthop
[dualtor-io] Fix duplication merge condition (sonic-net#18828)
8ca89aa 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
@lolyu @gshemesh2
[dualtor-io] Fix duplication merge condition (sonic-net#18828)
681d3f1 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
@lolyu @ytzur1
[dualtor-io] Fix duplication merge condition (sonic-net#18828)
788e4bb 
What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
Signed-off-by: Yael Tzur <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yxieca yxieca yxieca approved these changes

@bingwang-ms bingwang-ms Awaiting requested review from bingwang-ms

Assignees

No one assigned

Labels

Approved for 202411 branch Approved for 202505 branch Included in 202411 branch Included in 202505 branch Request for 202411 branch Request for 202505 branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lolyu @mssonicbld @yxieca @yejianquan