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

[ptf] Consider only expected packets for timeout #21150

Merged
merged 1 commit into from
Dec 20, 2024
Merged

[ptf] Consider only expected packets for timeout #21150

merged 1 commit into from
Dec 20, 2024

Conversation

vkjammala-arista
Copy link
Contributor

@vkjammala-arista vkjammala-arista commented Dec 12, 2024 •
edited
Loading

Why I did it

dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue https://github.com/aristanetworks/sonic-qual.msft/issues/325 for more details.

Work item tracking
  • Microsoft ADO (number only):

How I did it

count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic).

How to verify it

With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.

Which release branch to backport (provide reason below if selected)

  • 202405
  • 202411

Reason: Issue is seen in 202405 branch.

Tested branch (Please provide the tested image version)

  • 202405

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@vkjammala-arista
[ptf] Consider only expected packets for timeout
bfccf84 
"count_matched_packets" method is getting stuck in a while loop as long
as ptf server port receives any packet (Ex: in dualtor case, we do see
continuous ICMP packets on ptf port). Fix is to consider only expected
packets w.r.t timeout (similar to "count_matched_packets_all_ports" logic).
@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

yaqiangz
yaqiangz approved these changes Dec 16, 2024
View reviewed changes
Copy link
Contributor

@yaqiangz yaqiangz left a comment

Choose a reason for hiding this comment

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

LGTM

@vkjammala-arista
Copy link
Contributor Author

Hi @StormLiangMS, please help merging this PR.

@yyynini
Copy link
Contributor

yyynini commented Dec 19, 2024

LGTM

@StormLiangMS StormLiangMS requested a review from yyynini December 20, 2024 00:20
StormLiangMS
StormLiangMS approved these changes Dec 20, 2024
View reviewed changes
Copy link
Contributor

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

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

LGTM

@StormLiangMS StormLiangMS merged commit 329c384 into sonic-net:master Dec 20, 2024
22 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Dec 20, 2024
@vkjammala-arista @mssonicbld
[ptf] Consider only expected packets for timeout (sonic-net#21150)
7c7433a 
Why I did it
dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue aristanetworks/sonic-qual.msft#325 for more details.

Work item tracking
Microsoft ADO (number only):
How I did it
count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic).

How to verify it
With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.
@mssonicbld mssonicbld mentioned this pull request Dec 20, 2024
Merged
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202411: #21233

mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Dec 20, 2024
@vkjammala-arista @mssonicbld
[ptf] Consider only expected packets for timeout (sonic-net#21150)
70e7765 
Why I did it
dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue aristanetworks/sonic-qual.msft#325 for more details.

Work item tracking
Microsoft ADO (number only):
How I did it
count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic).

How to verify it
With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.
@mssonicbld mssonicbld mentioned this pull request Dec 20, 2024
Merged
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202405: #21234

mssonicbld pushed a commit that referenced this pull request Dec 24, 2024
@vkjammala-arista @mssonicbld
[ptf] Consider only expected packets for timeout (#21150)
4feafb4 
Why I did it
dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue aristanetworks/sonic-qual.msft#325 for more details.

Work item tracking
Microsoft ADO (number only):
How I did it
count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic).

How to verify it
With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.
mssonicbld pushed a commit that referenced this pull request Dec 24, 2024
@vkjammala-arista @mssonicbld
[ptf] Consider only expected packets for timeout (#21150)
6b6ac2c 
Why I did it
dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue aristanetworks/sonic-qual.msft#325 for more details.

Work item tracking
Microsoft ADO (number only):
How I did it
count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic).

How to verify it
With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.
github-actions bot pushed a commit to bradh352/sonic-buildimage that referenced this pull request Jan 2, 2025
@vkjammala-arista @bradh352
[ptf] Consider only expected packets for timeout (sonic-net#21150)
bc2cd5e 
Why I did it
dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue aristanetworks/sonic-qual.msft#325 for more details.

Work item tracking
Microsoft ADO (number only):
How I did it
count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic).

How to verify it
With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.
github-actions bot pushed a commit to bradh352/sonic-buildimage that referenced this pull request Jan 2, 2025
@vkjammala-arista @bradh352
[ptf] Consider only expected packets for timeout (sonic-net#21150)
9ab473e 
Why I did it
dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue aristanetworks/sonic-qual.msft#325 for more details.

Work item tracking
Microsoft ADO (number only):
How I did it
count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic).

How to verify it
With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.
github-actions bot pushed a commit to bradh352/sonic-buildimage that referenced this pull request Jan 2, 2025
@vkjammala-arista @bradh352
[ptf] Consider only expected packets for timeout (sonic-net#21150)
10c7003 
Why I did it
dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue aristanetworks/sonic-qual.msft#325 for more details.

Work item tracking
Microsoft ADO (number only):
How I did it
count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic).

How to verify it
With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.
VladimirKuk pushed a commit to Marvell-switching/sonic-buildimage that referenced this pull request Jan 21, 2025
@vkjammala-arista @VladimirKuk
[ptf] Consider only expected packets for timeout (sonic-net#21150)
5b131d9 
Why I did it
dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue aristanetworks/sonic-qual.msft#325 for more details.

Work item tracking
Microsoft ADO (number only):
How I did it
count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic).

How to verify it
With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yyynini yyynini yyynini approved these changes

@StormLiangMS StormLiangMS StormLiangMS approved these changes

@lolyu lolyu lolyu approved these changes

@yaqiangz yaqiangz yaqiangz approved these changes

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

Assignees
No one assigned
Labels
Approved for 202405 Branch Approved for 202411 Branch Included in 202405 Branch Included in 202411 Branch Request for 202405 Branch Request for 202411 Branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@vkjammala-arista @mssonicbld @yyynini @yaqiangz @lolyu @StormLiangMS