Add `ActiveActiveStateMachine` implementation by lolyu · Pull Request #64 · sonic-net/sonic-linkmgrd

lolyu · 2022-04-13T10:32:09Z

Description of PR

Summary:
Fixes # (issue)

Type of change

Bug fix
New feature
Doc/Design
Unit test

Approach

What is the motivation for this PR?

Add link manager state machine ActiveActiveStateMachine to work if the port is in active-active cable type.

How did you do it?

Add ActiveActiveStateMachine to cover the following scenarions:

if the mux state is active, and link prober receives unknown event, linkmgrd will try to switch the mux to standby.
if the mux state is standby, and link prober receives active event, linkmgrd will try to switch the mux to active.
if the mux state is active, and link down event received, linkmgrd will try to switch the mux to standby.
if the mux state is active, and mux config set to standby, linkmgrd will try to switch the mux to standby even with link prober active event.

How did you verify/test it?

Add unittests to cover the above scenarios.

Any platform specific information?

Documentation

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

…pe port Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

For port in `active-active` port cable type, use `Wait` state as initial state. 1. Modify `Wait` state so it could change to `Unknown` state if port cable type is `active-active`. Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

1. Explicit inistantiate template function `postLinkProberEvent` to work for `IcmpSelfEvent` and `IcmpPeerEvent`. 2. Use lambda functions to call `processEvent` instead of with `boost::bind`, so it could use those overloads of `processEvent`. Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Add a mux prober timer `mDeadlineTimer`, so that, after a mux probe, if linkmgrd didn't receives a valid mux state probe response as either active or standby, it will tries to probe again. Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

zjswhhh · 2022-04-27T02:23:15Z

src/link_manager/LinkManagerStateMachineActiveActive.cpp

+    if (errorCode == boost::system::errc::success) {
+        if (ms(mCompositeState) == mux_state::MuxState::Label::Unknown ||
+            ms(mCompositeState) == mux_state::MuxState::Label::Error ||
+            ms(mCompositeState) == mux_state::MuxState::Label::Wait) {


Thought we got rid of Wait in active-active?

Yes, Wait will only occur in the initial state (Wait, Wait, Down)

zjswhhh · 2022-04-27T02:35:01Z

src/link_manager/LinkManagerStateMachineActiveActive.cpp

+        mDeadlineTimer.cancel();
+        startMuxWaitTimer();
+    } else {
+        probeMuxState();


if in non-auto mode, and probing back a mux state that is different than mux mode, will we switch to match mux mode?

I guess the question is, is mux mode a "must-be" or a "preference"?

Currently, the mux mode is more like a one-time-off setting, after setting the mux mode, linkmgrd now assumes the toggle must be a success, and won't react to any more state changes.

Will it make more sense in active-active to keep mux state aligned with mux mode? But we can leave it as same as active-standby (one-time setting) for now.

zjswhhh

LGTM.

lolyu force-pushed the addActiveActiveStateMachine branch 5 times, most recently from 12e385d to a5af507 Compare April 18, 2022 10:30

lolyu added 4 commits April 18, 2022 10:33

Collect SoC IP address

c7a0ea7

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Move mComponentInitState to LinkProberStateMachineBase

35d46ad

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Move postMuxStateEvent to LinkManagerStateMachineBase

748522c

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Use known MAC addresses for ports in active-active cable type

6db30c1

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

lolyu force-pushed the addActiveActiveStateMachine branch from a5af507 to 9cf2ae9 Compare April 18, 2022 10:33

Add ActiveActiveStateMachine

0b1c2e0

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

lolyu force-pushed the addActiveActiveStateMachine branch from 9cf2ae9 to 0b1c2e0 Compare April 19, 2022 08:34

lolyu added 15 commits April 19, 2022 08:40

[MuxPort] Use ActiveActiveStateMachine for active-active cable ty…

9f43ff2

…pe port Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Fix issues

d0326e1

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Use LinkProberStateMachineActiveActive for ActiiveActiveStateMachine

040ab63

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Remove redundant checks

2fb104d

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Add function pointer setters fortesting purpose

a44caec

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

[unittest][MuxManagerTest] Cover active-active

67965e3

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

[unittest][FakeMuxPort] Support ActiveActiveStateMachine

3b8b44d

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Use Wait state for link prober self init state

e06b63c

For port in `active-active` port cable type, use `Wait` state as initial state. 1. Modify `Wait` state so it could change to `Unknown` state if port cable type is `active-active`. Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Introduce PeerWait as initial state for peer link prober state

a98fbd9

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Add missing link prober state strings

11bc86b

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Introduce missing transition functions

69e6754

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

[unittest] Enable FakeMuxPort to support port cable type

98c8d1d

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

[unittest] Add functions to set peer mux state

16ca46b

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

[unittest] Test ActiveActiveStateMachine

b1ffe53

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

lolyu requested review from yxieca and zjswhhh April 25, 2022 05:55

lolyu marked this pull request as ready for review April 25, 2022 05:55

lolyu added 8 commits April 25, 2022 06:42

Removeunused soc ip map

b0d572c

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Add stateDbPeerMuxResponseTable to selectables

cf9094f

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Reset unknown event count

347ee80

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Reset peer active and unknown counter

502a1ee

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Improve code format

1138d09

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Add virtual peer link prober state getter and setter

be61400

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Add missing link prober function pointer

38375c8

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Fix various issues

83ddb52

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

lolyu force-pushed the addActiveActiveStateMachine branch from 8608abe to 83ddb52 Compare April 25, 2022 13:00

sonic-net deleted a comment from lgtm-com bot Apr 25, 2022

lolyu added 2 commits April 25, 2022 13:27

[unittest] Fix various issues

86b7a83

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Add mux probe timer

f67ba98

Add a mux prober timer `mDeadlineTimer`, so that, after a mux probe, if linkmgrd didn't receives a valid mux state probe response as either active or standby, it will tries to probe again. Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

zjswhhh reviewed Apr 27, 2022

View reviewed changes

zjswhhh approved these changes Apr 27, 2022

View reviewed changes

lolyu merged commit df51322 into sonic-net:master May 6, 2022

zjswhhh mentioned this pull request Jun 6, 2022

[doc] active-active dual ToR HLD sonic-net/SONiC#1005

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `ActiveActiveStateMachine` implementation#64

Add `ActiveActiveStateMachine` implementation#64
lolyu merged 30 commits intosonic-net:masterfrom
lolyu:addActiveActiveStateMachine

lolyu commented Apr 13, 2022 •

edited

Loading

Uh oh!

zjswhhh Apr 27, 2022

Uh oh!

lolyu Apr 27, 2022

Uh oh!

zjswhhh Apr 27, 2022

Uh oh!

zjswhhh Apr 27, 2022

Uh oh!

lolyu Apr 27, 2022

Uh oh!

zjswhhh Apr 27, 2022

Uh oh!

zjswhhh left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

lolyu commented Apr 13, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

Documentation

Uh oh!

zjswhhh Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

lolyu Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

zjswhhh Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

zjswhhh Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

lolyu Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

zjswhhh Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

zjswhhh left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

lolyu commented Apr 13, 2022 •

edited

Loading