forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[libteam][warm-reboot] fix issue in teamd warm-reboot that teamd star…
…ts (sonic-net#8227) with state of tdport from previous warm-reboot. In case LAG was down before reboot, lacp->wr is not cleared. In lacp_event_watch_port_flush_data we incremented nr_of_tdports and add tdport to lacp->wr.state. In case lacp->wr.state already had this tdport we do not set new state for tdport but appened a new item in lacp->wr.state. In case we preformed warm-reboot and PortChannel member was down, after reboot PortChannel member became up next warm-reboot will initialize teamd with PortChannel member in down state. Fix this issue by calling stop_wr_mode() when LAG was down. This was probably intended but missed. #### Why I did it To fix an issue seen in warm-reboot-sad test cases. #### How I did it I fixed it in SONiC libteam patch that adds warm-reboot support. Details in commit description. #### How to verify it Run warm-reboot-sad test on t0-56 topology.
- Loading branch information
1 parent
c895677
commit 8a2ba14
Showing
1 changed file
with
12 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From a4ab4de68134f6425f704a2ddcda33a4930645de Mon Sep 17 00:00:00 2001 | ||
From cdc7eb674bb779b9e5181921e4c7c2b2f0a0db41 Mon Sep 17 00:00:00 2001 | ||
From: Pavel Shirshov <[email protected]> | ||
Date: Tue, 3 Mar 2020 13:04:57 -0800 | ||
Subject: [PATCH] [libteam]: Reimplement Warm-Reboot procedure' | ||
|
@@ -9,8 +9,8 @@ Subject: [PATCH] [libteam]: Reimplement Warm-Reboot procedure' | |
teamd/teamd.h | 6 + | ||
teamd/teamd_events.c | 13 ++ | ||
teamd/teamd_per_port.c | 6 + | ||
teamd/teamd_runner_lacp.c | 474 +++++++++++++++++++++++++++++++++++--- | ||
6 files changed, 512 insertions(+), 44 deletions(-) | ||
teamd/teamd_runner_lacp.c | 475 +++++++++++++++++++++++++++++++++++--- | ||
6 files changed, 513 insertions(+), 44 deletions(-) | ||
|
||
diff --git a/libteam/ifinfo.c b/libteam/ifinfo.c | ||
index 46d56a2..b86d34c 100644 | ||
|
@@ -35,7 +35,7 @@ index 46d56a2..b86d34c 100644 | |
} | ||
} | ||
diff --git a/teamd/teamd.c b/teamd/teamd.c | ||
index bf42347..221d71d 100644 | ||
index 421e34d..33512a6 100644 | ||
--- a/teamd/teamd.c | ||
+++ b/teamd/teamd.c | ||
@@ -117,7 +117,9 @@ static void print_help(const struct teamd_context *ctx) { | ||
|
@@ -203,7 +203,7 @@ index 221803e..bd4dcc1 100644 | |
struct teamd_port *tdport) | ||
{ | ||
diff --git a/teamd/teamd_per_port.c b/teamd/teamd_per_port.c | ||
index 166da57..03f8d63 100644 | ||
index 166da57..cefd6c2 100644 | ||
--- a/teamd/teamd_per_port.c | ||
+++ b/teamd/teamd_per_port.c | ||
@@ -350,6 +350,12 @@ static int teamd_port_remove(struct teamd_context *ctx, | ||
|
@@ -220,7 +220,7 @@ index 166da57..03f8d63 100644 | |
tdport->ifname, tdport->ifindex); | ||
err = team_port_remove(ctx->th, tdport->ifindex); | ||
diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c | ||
index 55abe88..f225fb2 100644 | ||
index 955ef0c..782fc05 100644 | ||
--- a/teamd/teamd_runner_lacp.c | ||
+++ b/teamd/teamd_runner_lacp.c | ||
@@ -31,6 +31,7 @@ | ||
|
@@ -523,7 +523,7 @@ index 55abe88..f225fb2 100644 | |
+ /* the port was up before the WR. Trying to restore it */ | ||
+ struct lacpdu lacpdu; | ||
+ err = lacpdu_read(lacp_port, &lacpdu); | ||
+ if (err) /* Can't read, so the port will start from scratch */ | ||
+ if (err) /* Can't read, so the port will start from scratch */ | ||
+ continue; | ||
+ teamd_log_info("WR-mode. State of the LAG member port '%s' was restored.", | ||
+ tdport->ifname); | ||
|
@@ -810,7 +810,7 @@ index 55abe88..f225fb2 100644 | |
static const struct teamd_event_watch_ops lacp_event_watch_ops = { | ||
.hwaddr_changed = lacp_event_watch_hwaddr_changed, | ||
.port_hwaddr_changed = lacp_event_watch_port_hwaddr_changed, | ||
@@ -1469,21 +1848,35 @@ static const struct teamd_event_watch_ops lacp_event_watch_ops = { | ||
@@ -1469,21 +1848,36 @@ static const struct teamd_event_watch_ops lacp_event_watch_ops = { | ||
.port_changed = lacp_event_watch_port_changed, | ||
.admin_state_changed = lacp_event_watch_admin_state_changed, | ||
.refresh = lacp_event_watch_refresh, | ||
|
@@ -832,6 +832,7 @@ index 55abe88..f225fb2 100644 | |
+ if (lacp->wr.carrier_up) { | ||
+ teamd_log_info("WR-mode. Starting in WR mode"); | ||
+ } else { | ||
+ stop_wr_mode(lacp); | ||
+ teamd_log_info("WR-mode. Starting in normal mode. The LAG interface was down before restart"); | ||
+ } | ||
+ ctx->warm_start_mode = lacp->wr.carrier_up; | ||
|
@@ -851,7 +852,7 @@ index 55abe88..f225fb2 100644 | |
return 0; | ||
} | ||
|
||
@@ -1951,6 +2344,12 @@ static int lacp_init(struct teamd_context *ctx, void *priv) | ||
@@ -1951,6 +2345,12 @@ static int lacp_init(struct teamd_context *ctx, void *priv) | ||
} | ||
|
||
lacp->ctx = ctx; | ||
|
@@ -864,7 +865,7 @@ index 55abe88..f225fb2 100644 | |
err = teamd_hash_func_set(ctx); | ||
if (err) | ||
return err; | ||
@@ -1992,10 +2391,13 @@ static void lacp_fini(struct teamd_context *ctx, void *priv) | ||
@@ -1992,10 +2392,13 @@ static void lacp_fini(struct teamd_context *ctx, void *priv) | ||
{ | ||
struct lacp *lacp = priv; | ||
|
||
|
@@ -880,5 +881,5 @@ index 55abe88..f225fb2 100644 | |
|
||
const struct teamd_runner teamd_runner_lacp = { | ||
-- | ||
2.17.1.windows.2 | ||
2.17.1 | ||
|