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

[libteam] Upgrade libteam to 1.28-1 and reorganize patches #2956

Merged
merged 1 commit into from
Jun 4, 2019
Merged

[libteam] Upgrade libteam to 1.28-1 and reorganize patches #2956

merged 1 commit into from
Jun 4, 2019

Conversation

lorchid
Copy link
Contributor

@lorchid lorchid commented May 30, 2019

Signed-off-by: yorke yorke.yuan@asterfusion.com

- What I did
Upgrade libteam to 1.28-1 and reorganize patches.

- How I did it
Modify Makefile and patch serires.

  1. Advance libteam to jpirko/libteam 5c5e498
  2. Advance debian supporting to debian/libteam.git 7188c361
  3. Remove patch 0001, 0010 and 0011 as they are already including in the new source code
  4. Reorganize the other patches simultaneously
    Note: NETLINK_RCVBUF is 196608 now (prev patch set it to 983040) and it works fine for testing. (Refering to libteam: double NETLINK_RCVBUF to fix -ENOMEM error)

- How to verify it
Build a SONiC image and run the lacp test in the sonic-mgmt repo. Ensure the test succeeds.

- Description for the changelog
modified: rules/libteam.mk
modified: src/libteam/Makefile
new file: src/libteam/patch/series
deleted: src/libteam/series
deleted: src/libteam/0001-libteam-Add-team_get_port_enabled-function.patch
deleted: src/libteam/0010-teamd-lacp-update-port-state-according-to-partners-sy.patch
deleted: src/libteam/0011-libteam-resynchronize-ifinfo-after-lost-RTNLGRP_LINK-.patch
renamed: src/libteam/0002-libteam-Temporarily-remove-redundant-debug-mes.patch -> src/libteam/patch/0001-Temporarily-remove-redundant-debug-messages.patch
renamed: src/libteam/0003-teamd-lacp-runner-will-send-lacp-update-right-after-.patch -> src/libteam/patch/0002-Lacp-runner-will-send-lacp-update-right-after-it-rec.patch
renamed: src/libteam/0004-libteam-Add-lacp-fallback-support-for-single-member-.patch -> src/libteam/patch/0003-Add-fallback-support-for-single-member-port-LAG.patch
renamed: src/libteam/0005-libteam-Add-warm_reboot-mode.patch -> src/libteam/patch/0004-Add-warm_reboot-mode.patch
renamed: src/libteam/0007-Skip-setting-the-same-hwaddr-to-lag-port-to-avoid-di.patch -> src/libteam/patch/0005-Skip-setting-the-same-hwaddr-to-lag-port-to-avoid-di.patch
renamed: src/libteam/0012-teamd-do-not-process-lacpdu-before-the-port-ifinfo-i.patch -> src/libteam/patch/0006-teamd-do-not-process-lacpdu-before-the-port-ifinfo-i.patch
renamed: src/libteam/0013-teamd-lacp-port-admin-down-recv-not-processing.patch -> src/libteam/patch/0007-Administratively-shutdown-port-channel-has-member-po.patch

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

pavel-shirshov
pavel-shirshov suggested changes May 30, 2019
View reviewed changes
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.

Thanks for the patch!

  1. Please add following PR in your patch: 3f4de49
  2. I think this is part of current libteam master now: 0006-teamd-do-not-process-lacpdu-before-the-port-ifinfo-i.patch
  3. Please reorder patches to make 0004-Add-warm_reboot-mode.patch as the last one.
  4. Please keep the NETLINK_RCVBUF as 983040. 196608 is not enough for the device with 32 team interfaces

@pavel-shirshov pavel-shirshov self-assigned this May 30, 2019
stcheng
stcheng suggested changes Jun 1, 2019
View reviewed changes
Copy link
Contributor

@stcheng stcheng left a comment

Choose a reason for hiding this comment

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

is 1.28-1 stable enough?

could you maintain the patches' original owner's names? otherwise it's losing tracks of who's the author of the patches.

@lorchid
Copy link
Contributor Author

lorchid commented Jun 3, 2019

is 1.28-1 stable enough?

could you maintain the patches' original owner's names? otherwise it's losing tracks of who's the author of the patches.

Thanks for the patch!

  1. Please add following PR in your patch: 3f4de49
  2. I think this is part of current libteam master now: 0006-teamd-do-not-process-lacpdu-before-the-port-ifinfo-i.patch
  3. Please reorder patches to make 0004-Add-warm_reboot-mode.patch as the last one.
  4. Please keep the NETLINK_RCVBUF as 983040. 196608 is not enough for the device with 32 team interfaces

OK. Thanks for reviewing. I will improve that as you suggest.

@stcheng
Copy link
Contributor

stcheng commented Jun 3, 2019

@lorchid thanks!

@pavel-shirshov
Copy link
Contributor

Can you please resolve the conflict and also remove "0014-Send-LACP-PDU-immediately-if-our-state-changed.patch" file?

@pavel-shirshov
Copy link
Contributor

For future references

0001-libteam-Add-team_get_port_enabled-function.patch            - master
0002-libteam-Temporarily-remove-redundant-debug-mes.patch        - 0001-libteam-Temporarily-remove-redundant-debug-messages.patch
0003-teamd-lacp-runner-will-send-lacp-update-right-after-.patch  - 0002-teamd-lacp-runner-will-send-lacp-update-right-after-.patch 
0004-libteam-Add-lacp-fallback-support-for-single-member-.patch  - 0003-libteam-Add-fallback-support-for-single-member-port-.patch 
0005-libteam-Add-warm_reboot-mode.patch                          - 0008-libteam-Add-warm_reboot-mode.patch
0007-Skip-setting-the-same-hwaddr-to-lag-port-to-avoid-di.patch  - 0004-Skip-setting-the-same-hwaddr-to-lag-port-to-avoid-di.patch 
0010-teamd-lacp-update-port-state-according-to-partners-sy.patch - master
0011-libteam-resynchronize-ifinfo-after-lost-RTNLGRP_LINK-.patch - master + 0005-Increase-default-buffer-size-from-98304-to-983040.patch 
0012-teamd-do-not-process-lacpdu-before-the-port-ifinfo-i.patch  - master
0013-teamd-lacp-port-admin-down-recv-not-processing.patch        - 0006-teamd-Administratively-shutdown-port-channel-has-mem.patch 
0014-Send-LACP-PDU-immediately-if-our-state-changed.patch        - 0007-Send-LACP-PDU-immediately-if-our-state-changed.patch

@lorchid
[libteam] Upgrade libteam to 1.28-1 and reorganize patches
6415cb7 
Signed-off-by: yorke <yorke.yuan@asterfusion.com>
stcheng
stcheng approved these changes Jun 4, 2019
View reviewed changes
Copy link
Contributor

@stcheng stcheng left a comment

Choose a reason for hiding this comment

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

thanks

@pavel-shirshov pavel-shirshov merged commit 6dbae0e into sonic-net:master Jun 4, 2019
mssonicbld added a commit that referenced this pull request Nov 12, 2023
@mssonicbld
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
a3f8153 
…lly (#17146)

#### Why I did it
src/sonic-swss
```
* 65720c1a - (HEAD -> 202305, origin/202305) Send hearbeat during warm reboot freese (#2923) (#2956) (14 hours ago) [Hua Liu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stcheng stcheng stcheng approved these changes

@pavel-shirshov pavel-shirshov pavel-shirshov approved these changes

Assignees

@pavel-shirshov pavel-shirshov

Labels
Enhancement ➕
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lorchid @stcheng @pavel-shirshov