Skip to content

[active-active] Always drive an explicit mux config to the driver #352

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

Open
Ndancejic wants to merge 1 commit into
base: master
Choose a base branch
from
+78 −3
Open

[active-active] Always drive an explicit mux config to the driver #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/link_manager/LinkManagerStateMachineActiveActive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,11 @@ void ActiveActiveStateMachine::handleMuxConfigNotification(const common::MuxPort
mMuxPortConfig.setMode(mode);
if (mComponentInitState.all()) {
CompositeState nextState = mCompositeState;
if (mode == common::MuxPortConfig::Mode::Active && ms(mCompositeState) != mux_state::MuxState::Label::Active) {
// Always drive an explicit config: the in-memory MUX state is bootstrapped on restart
// without being reconciled against the driver, so it is no proof the hardware agrees.
if (mode == common::MuxPortConfig::Mode::Active) {
switchMuxState(nextState, mux_state::MuxState::Label::Active, true);
} else if (mode == common::MuxPortConfig::Mode::Standby && ms(mCompositeState) != mux_state::MuxState::Label::Standby) {
} else if (mode == common::MuxPortConfig::Mode::Standby) {
switchMuxState(nextState, mux_state::MuxState::Label::Standby, true);
} else if (mode == common::MuxPortConfig::Mode::Auto && ms(mCompositeState) == mux_state::MuxState::Label::Unknown) {
MUXLOGINFO(boost::format("%s: reset link prober state") % mMuxPortConfig.getPortName());
Expand Down
75 changes: 74 additions & 1 deletion test/LinkManagerStateMachineActiveActiveTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,78 @@ TEST_F(LinkManagerStateMachineActiveActiveTest, ConfigStandbySocAgentRestart)
VALIDATE_STATE(Active, Active, Up);
}

TEST_F(LinkManagerStateMachineActiveActiveTest, MuxActiveConfigActiveReDrivesMuxState)
{
setMuxActive();
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 1);

handleMuxConfig("active", 1);
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 2);
EXPECT_EQ(mDbInterfacePtr->mLastSetMuxState, mux_state::MuxState::Label::Active);
VALIDATE_STATE(Active, Active, Up);
}

TEST_F(LinkManagerStateMachineActiveActiveTest, MuxStandbyConfigStandbyReDrivesMuxState)
{
setMuxStandby();
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 1);

handleMuxConfig("standby", 1);
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 2);
EXPECT_EQ(mDbInterfacePtr->mLastSetMuxState, mux_state::MuxState::Label::Standby);
VALIDATE_STATE(Unknown, Standby, Up);
}

TEST_F(LinkManagerStateMachineActiveActiveTest, MuxConfigActiveAfterRestartMatchingBootstrappedState)
{
// Restart: the mux state is bootstrapped from state db before the state machine is
// activated, so the config below matches it and calculates no state transition.
postLinkEvent(link_state::LinkState::Up, 0, true);
VALIDATE_STATE(Wait, Wait, Up);

handleMuxState("active", 0, true);
VALIDATE_STATE(Wait, Active, Up);

activateStateMachine();
pollIoService();
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 0);
VALIDATE_STATE(Wait, Active, Up);

handleMuxConfig("active", 1);
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 1);
EXPECT_EQ(mDbInterfacePtr->mLastSetMuxState, mux_state::MuxState::Label::Active);
VALIDATE_STATE(Wait, Active, Up);
}

TEST_F(LinkManagerStateMachineActiveActiveTest, MuxConfigActiveBeforeInitMatchingBootstrappedState)
{
// Config read before initialization is deferred and replayed once all components are up.
handleMuxConfig("active", 0, true);
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 0);

postLinkEvent(link_state::LinkState::Up, 0, true);
VALIDATE_STATE(Wait, Wait, Up);

handleMuxState("active", 0, true);
VALIDATE_STATE(Wait, Active, Up);

activateStateMachine();
pollIoService();
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 1);
EXPECT_EQ(mDbInterfacePtr->mLastSetMuxState, mux_state::MuxState::Label::Active);
VALIDATE_STATE(Wait, Active, Up);
}

TEST_F(LinkManagerStateMachineActiveActiveTest, MuxActiveConfigAutoDoesNotReDriveMuxState)
{
setMuxActive();
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 1);

handleMuxConfig("auto", 1);
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 1);
VALIDATE_STATE(Active, Active, Up);
}

TEST_F(LinkManagerStateMachineActiveActiveTest, MuxActiveLinkProberPeerActive)
{
setMuxActive();
Expand Down Expand Up @@ -634,11 +706,12 @@ TEST_F(LinkManagerStateMachineActiveActiveTest, MuxActivDefaultRouteStateMuxConf

handleMuxConfig("active", 2);
EXPECT_EQ(mFakeMuxPort.mFakeLinkProber->mRestartTxProbeCallCount, 2);
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 2);

postDefaultRouteEvent("na", 1);
EXPECT_EQ(mFakeMuxPort.mFakeLinkProber->mShutdownTxProbeCallCount, 0);
EXPECT_EQ(mFakeMuxPort.mFakeLinkProber->mRestartTxProbeCallCount, 3);
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 1);
EXPECT_EQ(mDbInterfacePtr->mSetMuxStateInvokeCount, 2);
VALIDATE_STATE(Active, Active, Up);
}

Expand Down
Loading