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

[teamd] fix lacp fallback mode breakage in teamd v1.28 #3572

Merged
merged 1 commit into from
Oct 11, 2019

Conversation

hzheng5
Copy link
Contributor

@hzheng5 hzheng5 commented Oct 7, 2019

fixes #951

In teamd v1.28, the port can only be enabled if sync bit is set
in recveived LACPDU from partner by the following commit
"teamd: lacp: update port state according to partner's sync bit"
(jpirko/libteam@54f137c)

However, lacp fallback feature needs to enable port even if partner
LACPDU is not received within a given period and fallback cfg is enabled.
To fix the lacp fallback breakage, we have to bypass the sync bit
check in lacp fallback mode.

Signed-off-by: Haiyang Zheng haiyang.z@alibaba-inc.com

- What I did
Fix lacp fallback mode breakage in teamd v 1.28

- How I did it

bypass the sync bit check in lacp fallback mode, which is introduced in teamd v1.28 and later

- How to verify it

verify that the port can enter and exit lacp fallback mode with the change as expected.

And the change passed the following test case
https://github.com/Azure/sonic-mgmt/pull/379/files

- Description for the changelog

[teamd] fix lacp fallback mode breakage in teamd v1.28

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

In teamd v1.28, the port can only be enabled if sync bit is set
in recveived LACPDU from partner by the following commit
"teamd: lacp: update port state according to partner's sync bit"
(jpirko/libteam@54f137c)

However, lacp fallback feature needs to enable port even if partner
LACPDU is not received within a given period and fallback cfg is enabled.
To fix the lacp fallback breakage, we have to bypass the sync bit
check in lacp fallback mode.

Signed-off-by: Haiyang Zheng <haiyang.z@alibaba-inc.com>
@lguohan
Copy link
Collaborator

lguohan commented Oct 10, 2019

retest vsimage please

Copy link
Contributor

@pavel-shirshov pavel-shirshov left a comment

Choose a reason for hiding this comment

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

See comments.

2017 21:07:53 -0800
commit f475746f56602a40861b8d94eac5f0979c4703f3
Author: yorke <yorke.yuan@asterfusion.com>
Date: Mon Jun 3 12:02:36 2019 +0800
Copy link
Contributor

Choose a reason for hiding this comment

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

You can remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the review. Looks like it's already merged.

@lguohan
Copy link
Collaborator

lguohan commented Oct 11, 2019

@pavel-shirshov , can you also check the test mention in the pr and approve or not?

@lguohan lguohan merged commit 7988deb into sonic-net:master Oct 11, 2019
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.

3 participants