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.

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

Fix an issue of all lldp entries take some time to be in DB after reboot in scaling setup. #15731

Merged
merged 3 commits into from
Dec 11, 2024

Conversation

wumiaont
Copy link
Contributor

Description of PR

It's found in scaling setup (34K BGP routes) test_lldp_entry_table_after_reboot test may fail as lldp table entries in DB and from show are not in sync. Further analysis shows that after reboot, full lldp entries takes longer time to come back into DB. Entries are coming to DB one by one and takes few seconds to have full data there.

Current test is calling reboot and check all critical services are up and all admin up ports are back to line then will begin lldp entries check. This could be too early as lldp packets are coming in one by one and lldp entries are written to DB one by one. The following few lldp queries could be out of sync in this scenario.

Solution is to take a query of how many lldp entries are in DB before reboot. After reboot will wait to check till all the lldp entries are in DB before further queries.

With this check the test passed on scaling setup.

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405

Approach

What is the motivation for this PR?

Fix test failure

How did you verify/test it?

Run lldp syncd OC tests with the fix. Did not see the issue.

@mssonicbld
Copy link
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/lldp/test_lldp_syncd.py:93:1: E302 expected 2 blank lines, found 1

flake8...............................................(no files to check)Skipped
check conditional mark sort..........................(no files to check)Skipped

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

tests/lldp/test_lldp_syncd.py Outdated Show resolved Hide resolved
Copy link
Contributor

@arista-nwolfe arista-nwolfe left a comment

Choose a reason for hiding this comment

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

Thanks for updating

@abdosi abdosi merged commit 24d6cbd into sonic-net:master Dec 11, 2024
16 checks passed
@abdosi
Copy link
Contributor

abdosi commented Dec 11, 2024

@yejianquan for 202405 branch.

mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Dec 11, 2024
…oot in scaling setup. (sonic-net#15731)

Fix an issue of all lldp entries take some time to be in DB after reboot in scaling setup
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202405: #16014

mssonicbld pushed a commit that referenced this pull request Dec 11, 2024
…oot in scaling setup. (#15731)

Fix an issue of all lldp entries take some time to be in DB after reboot in scaling setup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants