Skip to content

change timeouts on changes involving bgp to allow for convergence#2058

Merged
yxieca merged 9 commits intosonic-net:masterfrom
slogan621:master
Aug 24, 2020
Merged

change timeouts on changes involving bgp to allow for convergence#2058
yxieca merged 9 commits intosonic-net:masterfrom
slogan621:master

Conversation

@slogan621
Copy link
Contributor

@slogan621 slogan621 commented Aug 6, 2020

[sonic-mgmt] replace 30 second sleeps around bgp changes to polling for up to 120 sec to allow time for convergence.

Signed-off-by: Syd Logan [email protected]

@slogan621
Copy link
Contributor Author

@Blueve please review

@slogan621 slogan621 marked this pull request as ready for review August 7, 2020 05:05
@ghost
Copy link

ghost commented Aug 7, 2020

CLA assistant check
All CLA requirements met.

@lgtm-com
Copy link

lgtm-com bot commented Aug 7, 2020

This pull request introduces 3 alerts and fixes 6 when merging 3bf58d6 into 384c948 - view on LGTM.com

new alerts:

  • 1 for Unused local variable
  • 1 for Syntax error
  • 1 for Variable defined multiple times

fixed alerts:

  • 3 for Except block handles 'BaseException'
  • 2 for Wrong name for an argument in a class instantiation
  • 1 for Unused import

@slogan621 slogan621 marked this pull request as draft August 7, 2020 20:58
@sydlogan
Copy link

sydlogan commented Aug 8, 2020

Retest vsimage please

1 similar comment
@sydlogan
Copy link

sydlogan commented Aug 8, 2020

Retest vsimage please

@slogan621 slogan621 marked this pull request as ready for review August 8, 2020 07:59
@slogan621 slogan621 requested a review from lguohan August 10, 2020 16:14
@slogan621
Copy link
Contributor Author

slogan621 commented Aug 12, 2020

@daall would you be able to review, merge? This replaces the sleep timeout with a polled wait for bgp convergence. I checked with bgp experts inside of Broadcom and I was told that 30 seconds may not be enough time, more like 120 (they suggested we try 180 but sticking with the 120 here).

@slogan621
Copy link
Contributor Author

@lguohan

bgp_facts = duthost.bgp_facts()['ansible_facts']
assert bgp_facts['bgp_statistics']['ipv4_idle'] == 1
if not wait_until(120, 10, duthost.check_bgp_statistic, 'ipv4_idle', 1):
assert duthost.get_bgp_statistic('ipv4_idle') == 1
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please use pytest_assert. assert sometimes triggers exception. (same for other asserts below)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done, thanks for the review.

@lgtm-com
Copy link

lgtm-com bot commented Aug 19, 2020

This pull request introduces 1 alert when merging e1208f8 into 47fc3a2 - view on LGTM.com

new alerts:

  • 1 for Unused local variable

@slogan621 slogan621 requested a review from yxieca August 20, 2020 04:18
@slogan621
Copy link
Contributor Author

@wangxin thank you

@yxieca yxieca merged commit 3457ff7 into sonic-net:master Aug 24, 2020
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
a6d35de Handling Invalid CRM configuration gracefully (sonic-net#2109)
d6559e6 [Mellanox] '_8lane' not added to Mellanox 5xxx models with 800G (sonic-net#2090)
45551b2 [vnetorch] Advertise vnet tunnel routes (sonic-net#2058)
ed58d2f Add initial value for weight in overlay nexthops (sonic-net#2096)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants