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

frr: T6746: additional improvements after 10.2 upgrade #4259

Merged
merged 5 commits into from
Dec 30, 2024

Conversation

c-po
Copy link
Member

@c-po c-po commented Dec 26, 2024

Change Summary

Some daemons (e.g. bgpd) have several nested substrings/sections like

router bgp 100
  address-family ipv4 unicast
  ..
  exit-address-family
exit

We can now use getFRRconfig() with the substring option to extract only

 address-family ipv4 unicast
 ..
 exit-address-family

Making config validation more granular

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

Copy link

github-actions bot commented Dec 26, 2024

👍
No issues in PR Title / Commit Title

Copy link
Member

@dmbaturin dmbaturin left a comment

Choose a reason for hiding this comment

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

Just a few small suggestions.

python/vyos/frrender.py Outdated Show resolved Hide resolved
smoketest/scripts/cli/base_vyostest_shim.py Outdated Show resolved Hide resolved
c-po added 4 commits December 29, 2024 09:35
Some daemons (e.g. bgpd) have several nested substrings/sections like

router bgp 100
 address-family ipv4 unicast
 ..
 exit-address-family
exit

We can now use getFRRconfig() with the substring option to extract only
 address-family ipv4 unicast
 ..
 exit-address-family

Making config validation more granular
@c-po c-po force-pushed the frr-10-improvements branch from e1b6908 to 990e93d Compare December 29, 2024 08:35
@c-po c-po requested a review from dmbaturin December 29, 2024 08:35
It was an invalid workarround as the underlaying issue seems to be a race
condition in CStore.

The commit process is not finished until all pending files from
VYATTA_CHANGES_ONLY_DIR are copied to VYATTA_ACTIVE_CONFIGURATION_DIR. This is
done inside libvyatta-cfg1 and the FUSE UnionFS part. On large non-interactive
commits FUSE UnionFS might not replicate the real state in time, leading to
errors when querying the working and effective configuration.

TO BE DELETED AFTER SWITCH TO IN MEMORY CONFIG
@c-po c-po force-pushed the frr-10-improvements branch from 990e93d to b1bf25e Compare December 29, 2024 21:12
Copy link

CI integration 👍 passed!

Details

CI logs

  • CLI Smoketests (no interfaces) 👍 passed
  • CLI Smoketests (interfaces only) 👍 passed
  • Config tests 👍 passed
  • RAID1 tests 👍 passed
  • TPM tests 👍 passed

@sever-sever sever-sever merged commit ec80c75 into vyos:current Dec 30, 2024
15 of 16 checks passed
@c-po c-po deleted the frr-10-improvements branch December 31, 2024 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

3 participants