matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix teamd behavior for Warm-reboot mode (#2241)

Browse Source 
* Fix teamd behavior for Warm-reboot mode

* Don't save 'read' state into the struct. Try to read a lacp file everytime when a port starts.

* Fix filename for access()
This commit is contained in:
pavel-shirshov 2018-11-13 10:53:20 -08:00 committed by lguohan
parent 41702e77b3
commit c61c1d5695
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/libteam/0005-libteam-Add-warm_reboot-mode.patch
View File

@ -157,7 +157,7 @@ index 5c2ef56..50e5a08 100644
struct teamd_port *tdport)
{
diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c
index 81324de..1d908db 100644
index 81324de..519f5e2 100644
--- a/teamd/teamd_runner_lacp.c
+++ b/teamd/teamd_runner_lacp.c
@@ -174,6 +174,8 @@ struct lacp_port {
@ -169,7 +169,21 @@ index 81324de..1d908db 100644
struct {
uint32_t speed;
uint8_t duplex;
@@ -1084,26 +1086,23 @@ static int lacpdu_send(struct lacp_port *lacp_port)
@@ -994,6 +996,13 @@ static int lacp_port_set_state(struct lacp_port *lacp_port,
break;
}
+ if (new_state != PORT_STATE_CURRENT) {
+ /* clean saved lacp pdu up when the current port:
+ disabled, expired, or defaulted */
+ (void)memset(&lacp_port->last_pdu, 0, sizeof(struct lacpdu));
+ lacp_port->lacpdu_saved = false;
+ }
+
teamd_log_info("%s: Changed port state: \"%s\" -> \"%s\"",
lacp_port->tdport->ifname,
lacp_port_state_name[lacp_port->state],
@@ -1084,26 +1093,23 @@ static int lacpdu_send(struct lacp_port *lacp_port)
return err;
}
@ -204,7 +218,7 @@ index 81324de..1d908db 100644
err = lacp_port_partner_update(lacp_port);
if (err)
return err;
@@ -1118,7 +1117,7 @@ static int lacpdu_recv(struct lacp_port *lacp_port)
@@ -1118,7 +1124,7 @@ static int lacpdu_recv(struct lacp_port *lacp_port)
/* Check if the other side has correct info about us */
if (!lacp_port->periodic_on &&
@ -213,7 +227,7 @@ index 81324de..1d908db 100644
sizeof(struct lacpdu_info))) {
err = lacpdu_send(lacp_port);
if (err)
@@ -1133,6 +1132,53 @@ static int lacpdu_recv(struct lacp_port *lacp_port)
@@ -1133,6 +1139,59 @@ static int lacpdu_recv(struct lacp_port *lacp_port)
return 0;
}
@ -242,6 +256,12 @@ index 81324de..1d908db 100644
+ if (filename[strlen(filename) - 1] != '/')
+ strcat(filename, "/"); /* Add trailing slash if we don't have one in the filename */
+ strcat(filename, lacp_port->tdport->ifname);
+
+ /* check that file is readable. if there is no file, don't do anything */
+ if (access(filename, R_OK) != 0) {
+ return 0;
+ }
+
+ fp = fopen(filename, "r");
+ if (!fp) {
+ teamd_log_err("Can't open lacp-saved dump from file %s: %s", filename, strerror(errno));
@ -267,21 +287,20 @@ index 81324de..1d908db 100644
static int lacp_callback_timeout(struct teamd_context *ctx, int events,
void *priv)
{
@@ -1299,6 +1345,13 @@ static int lacp_port_added(struct teamd_context *ctx,
@@ -1299,6 +1358,12 @@ static int lacp_port_added(struct teamd_context *ctx,
lacp_port_actor_init(lacp_port);
lacp_port_link_update(lacp_port);
+ /* Read data from file and process it */
+ if (ctx->warm_start && ctx->lacp_directory) {
+ (void)lacpdu_read(lacp_port);
+ ctx->warm_start = false;
+ /* Once started, keep running in normal mode */
+ }
+
teamd_loop_callback_enable(ctx, LACP_SOCKET_CB_NAME, lacp_port);
return 0;
@@ -1321,7 +1374,11 @@ static void lacp_port_removed(struct teamd_context *ctx,
@@ -1321,7 +1386,11 @@ static void lacp_port_removed(struct teamd_context *ctx,
{
struct lacp_port *lacp_port = priv;
@ -294,7 +313,7 @@ index 81324de..1d908db 100644
teamd_loop_callback_del(ctx, LACP_TIMEOUT_CB_NAME, lacp_port);
teamd_loop_callback_del(ctx, LACP_PERIODIC_CB_NAME, lacp_port);
teamd_loop_callback_del(ctx, LACP_SOCKET_CB_NAME, lacp_port);
@@ -1413,6 +1470,31 @@ static void lacp_event_watch_refresh(struct teamd_context *ctx, struct teamd_por
@@ -1413,6 +1482,31 @@ static void lacp_event_watch_refresh(struct teamd_context *ctx, struct teamd_por
(void) lacpdu_send(lacp_port);
}
@ -326,7 +345,7 @@ index 81324de..1d908db 100644
static const struct teamd_event_watch_ops lacp_event_watch_ops = {
.hwaddr_changed = lacp_event_watch_hwaddr_changed,
.port_added = lacp_event_watch_port_added,
@@ -1420,6 +1502,7 @@ static const struct teamd_event_watch_ops lacp_event_watch_ops = {
@@ -1420,6 +1514,7 @@ 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,
@ -334,7 +353,7 @@ index 81324de..1d908db 100644
};
static int lacp_carrier_init(struct teamd_context *ctx, struct lacp *lacp)
@@ -1946,7 +2029,7 @@ static void lacp_fini(struct teamd_context *ctx, void *priv)
@@ -1946,7 +2041,7 @@ static void lacp_fini(struct teamd_context *ctx, void *priv)
teamd_state_val_unregister(ctx, &lacp_state_vg, lacp);
teamd_balancer_fini(lacp->tb);
teamd_event_watch_unregister(ctx, &lacp_event_watch_ops, lacp);