Move teamd warm reboot code to service script #5163

heidinet2007 · 2020-08-12T17:33:35Z

Move teamd warm reboot code to teamd service at /usr/local/bin

…/local/bin

…ice /usr/local/bin" This reverts commit d16d163.

heidinet2007 · 2020-08-25T21:33:08Z

please re-test

heidinet2007 · 2020-08-26T16:42:16Z

please retest

files/scripts/teamd.sh

…t reboot based on latest community code

… fast reboot based on latest community code

… 2) apply multi-asic support to script

1) Remove space in variable assignement 2) Apply multi-asic support

files/scripts/teamd.sh

1) Remove "systemctl stop ${SERVICE}$DEV" for fast-reboot 2) Call /user/bin/teamd.sh to stop teamd for all cases

files/build_templates/sonic_debian_extension.j2

vaibhavhd

Minor comments added. It would be also better if we have output logs for start,stop,wait.

files/scripts/teamd.sh

vaibhavhd · 2020-10-27T16:06:27Z

files/scripts/teamd.sh

+start() {
+    debug "Starting ${SERVICE}$DEV service..."
+
+    check_warm_boot


Should we also wait for database initialization before accessing it? I see that some of the service scripts use it, and some are missing it already.

https://github.com/Azure/sonic-buildimage/blob/master/files/scripts/swss.sh#L60
https://github.com/Azure/sonic-buildimage/blob/master/files/scripts/swss.sh#L137

I saw this wait_for_database_service() is called from swss and syncd. Teamd already has dependancy on swss.

yxieca · 2020-10-28T16:19:07Z

retest broadcom please

yxieca · 2020-10-28T16:19:15Z

retest vsimage please

yxieca · 2020-10-29T17:02:27Z

retest vsimage please

yxieca · 2020-10-30T15:49:51Z

retest vsimage please

…les and unnecessary space

vaibhavhd

LGTM, thanks Heidi.

vaibhavhd · 2020-11-03T04:56:33Z

Retest vsimage please

vaibhavhd · 2020-11-03T04:57:04Z

Retest mellanox please

vaibhavhd · 2020-11-04T08:09:09Z

Retest vsimage please

vaibhavhd · 2020-11-04T16:25:31Z

Retest vsimage please

vaibhavhd · 2020-11-04T19:39:10Z

Retest vsimage please

vaibhavhd · 2020-11-06T18:02:05Z

Retest vsimage please

yxieca · 2020-11-09T16:26:30Z

retest vsimage please

vaibhavhd · 2020-11-09T22:54:33Z

The vsimage tests are failing due to incorrect permissions set on a new teamd script being added by this PR. Below is the fix:

$ git diff
diff --git a/files/scripts/teamd.sh b/files/scripts/teamd.sh
old mode 100644
new mode 100755

This would prevent the below error seen in syslog:

Nov  9 18:45:02.563249 sonic INFO systemd[1]: Starting TEAMD container...
Nov  9 18:45:02.564008 sonic ERR systemd[1867]: teamd.service: Failed to execute command: Permission denied
Nov  9 18:45:02.564329 sonic ERR systemd[1867]: teamd.service: Failed at step EXEC spawning /usr/local/bin/teamd.sh: Permission denied

@heidinet2007 I am unable to make this change on the fork. Can you make this change, or give me permission to do so?

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

yxieca · 2020-11-13T01:55:48Z

The vsimage tests are failing due to incorrect permissions set on a new teamd script being added by this PR. Below is the fix:
$ git diff
diff --git a/files/scripts/teamd.sh b/files/scripts/teamd.sh
old mode 100644
new mode 100755
This would prevent the below error seen in syslog:
Nov  9 18:45:02.563249 sonic INFO systemd[1]: Starting TEAMD container...
Nov  9 18:45:02.564008 sonic ERR systemd[1867]: teamd.service: Failed to execute command: Permission denied
Nov  9 18:45:02.564329 sonic ERR systemd[1867]: teamd.service: Failed at step EXEC spawning /usr/local/bin/teamd.sh: Permission denied
@heidinet2007 I am unable to make this change on the fork. Can you make this change, or give me permission to do so?

@heidinet2007 I've pushed a change to your branch to change file permission.

yxieca · 2020-11-13T17:41:04Z

retest vsimage please

vaibhavhd

LGTM, thanks!

A new teamd service script has been added in sonic-buildimage as part of the PR - sonic-net/sonic-buildimage#5163 With this change, fast-reboot script will now use the new teamd script to handle killing teamd docker in both fast-boot and warm-boot mode. Replaced the existing teamd docker handling in fast-reboot script with the systemctl stop teamd. Tested the locally modified script in a DUT for warm-reboot and fast-reboot.

Summary: Move teamd functions to a new service script Motivation: To segregate teamd functions in one common place. fast-reboot script calls teamd functions that should ideally be replaced by a simple call to a service script. Changes: New teamd service script and path modification from /usr/bin/teamd.sh to /usr/local/bin/teamd.sh fast-reboot script (in sonic-utilities) modification (to use new teamd.sh to stop teamd) should follow soon after this change. Verification: VS image tests. Signed-off-by: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com> Co-authored-by: heidi.ou@alibaba-inc.com <heidi.ou@alibaba-inc.com> Co-authored-by: Ying Xie <ying.xie@microsoft.com>

A new teamd service script has been added in sonic-buildimage as part of the PR - sonic-net/sonic-buildimage#5163 With this change, fast-reboot script will now use the new teamd script to handle killing teamd docker in both fast-boot and warm-boot mode. Replaced the existing teamd docker handling in fast-reboot script with the systemctl stop teamd. Tested the locally modified script in a DUT for warm-reboot and fast-reboot.

heidi.ou@alibaba-inc.com and others added 9 commits January 8, 2020 10:14

[sonic-buildimage] Move BGP warm reboot scripts into BGP service /usr…

d16d163

…/local/bin

Revert "[sonic-buildimage] Move BGP warm reboot scripts into BGP serv…

93add80

…ice /usr/local/bin" This reverts commit d16d163.

Merge remote-tracking branch 'upstream/master'

bf4cee2

Merge remote-tracking branch 'upstream/master'

1b9e1f9

Merge remote-tracking branch 'upstream/master'

790b2d0

Merge branch 'master' of https://github.com/Azure/sonic-buildimage

4151184

Move teamd warm reboot functions to service scripts

5e4b025

Merge branch 'master' of https://github.com/Azure/sonic-buildimage

ab241d5

Merge branch 'master' into teamd

a912623

heidinet2007 added 2 commits August 26, 2020 06:49

Move teamd warm reboot code to teamd service at /usr/local/bin

76cb10a

Move teamd warm reboot code to service script

628d41f

yxieca reviewed Sep 11, 2020

View reviewed changes

files/scripts/teamd.sh Outdated Show resolved Hide resolved

heidinet2007 added 4 commits October 20, 2020 10:00

Address review comments: pass different sigusr to warm reboot and fas…

e06df98

…t reboot based on latest community code

Address code review comment: pass different sigusr to warm reboot and…

95ac98f

… fast reboot based on latest community code

Address code review comments: 1) remove space in variable assignement…

02f3abf

… 2) apply multi-asic support to script

Address code review comments:

c927519

1) Remove space in variable assignement 2) Apply multi-asic support

yxieca reviewed Oct 27, 2020

View reviewed changes

files/scripts/teamd.sh Outdated Show resolved Hide resolved

yxieca reviewed Oct 27, 2020

View reviewed changes

files/scripts/teamd.sh Outdated Show resolved Hide resolved

Address code review comment:

c7e32db

1) Remove "systemctl stop ${SERVICE}$DEV" for fast-reboot 2) Call /user/bin/teamd.sh to stop teamd for all cases

yxieca previously approved these changes Oct 27, 2020

View reviewed changes

Update comment context to reflect current code

0570547

heidinet2007 dismissed yxieca’s stale review via 0570547 October 27, 2020 05:51

vaibhavhd reviewed Oct 27, 2020

View reviewed changes

files/build_templates/sonic_debian_extension.j2 Show resolved Hide resolved

vaibhavhd reviewed Oct 27, 2020

View reviewed changes

anshuv-mfst mentioned this pull request Oct 28, 2020

PortChannel IP addresses are lost after restarting teamd service #5709

Open

Address code revew comments: update comments and remove unused variab…

e1538e9

…les and unnecessary space

yxieca previously approved these changes Oct 31, 2020

View reviewed changes

vaibhavhd previously approved these changes Oct 31, 2020

View reviewed changes

chmod +x teamd.sh

8a4e634

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

yxieca dismissed stale reviews from vaibhavhd and themself via 8a4e634 November 13, 2020 01:54

vaibhavhd approved these changes Nov 13, 2020

View reviewed changes

vaibhavhd merged commit 7c17c58 into sonic-net:master Nov 13, 2020

vaibhavhd mentioned this pull request Nov 18, 2020

Modify fast-reboot script to use teamd service script sonic-net/sonic-utilities#1251

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move teamd warm reboot code to service script #5163

Move teamd warm reboot code to service script #5163

heidinet2007 commented Aug 12, 2020

heidinet2007 commented Aug 25, 2020

heidinet2007 commented Aug 26, 2020

vaibhavhd left a comment

vaibhavhd Oct 27, 2020

heidinet2007 Oct 31, 2020

yxieca commented Oct 28, 2020

yxieca commented Oct 28, 2020

yxieca commented Oct 29, 2020

yxieca commented Oct 30, 2020

vaibhavhd left a comment

vaibhavhd commented Nov 3, 2020

vaibhavhd commented Nov 3, 2020

vaibhavhd commented Nov 4, 2020

vaibhavhd commented Nov 4, 2020

vaibhavhd commented Nov 4, 2020

vaibhavhd commented Nov 6, 2020

yxieca commented Nov 9, 2020

vaibhavhd commented Nov 9, 2020

yxieca commented Nov 13, 2020

yxieca commented Nov 13, 2020

vaibhavhd left a comment

Move teamd warm reboot code to service script #5163

Move teamd warm reboot code to service script #5163

Conversation

heidinet2007 commented Aug 12, 2020

heidinet2007 commented Aug 25, 2020

heidinet2007 commented Aug 26, 2020

vaibhavhd left a comment

Choose a reason for hiding this comment

vaibhavhd Oct 27, 2020

Choose a reason for hiding this comment

heidinet2007 Oct 31, 2020

Choose a reason for hiding this comment

yxieca commented Oct 28, 2020

yxieca commented Oct 28, 2020

yxieca commented Oct 29, 2020

yxieca commented Oct 30, 2020

vaibhavhd left a comment

Choose a reason for hiding this comment

vaibhavhd commented Nov 3, 2020

vaibhavhd commented Nov 3, 2020

vaibhavhd commented Nov 4, 2020

vaibhavhd commented Nov 4, 2020

vaibhavhd commented Nov 4, 2020

vaibhavhd commented Nov 6, 2020

yxieca commented Nov 9, 2020

vaibhavhd commented Nov 9, 2020

yxieca commented Nov 13, 2020

yxieca commented Nov 13, 2020

vaibhavhd left a comment

Choose a reason for hiding this comment