Skip to content

Disable the feature that decreases link probe interval for measuring switch overhead #49

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

Merged
zjswhhh merged 2 commits into from
Apr 1, 2022
Merged

Disable the feature that decreases link probe interval for measuring switch overhead #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f2b056
disable switchover measuring based on link prober
zjswhhh Mar 28, 2022
9357d73
Merge branch 'master' of https://github.com/Azure/sonic-linkmgrd into…
zjswhhh Mar 31, 2022
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
11 changes: 11 additions & 0 deletions src/common/MuxPortConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,15 @@ class MuxPortConfig
*/
inline void setPortCableType(PortCableType portCableType) { mPortCableType = portCableType; };

/**
* @method ifEnableSwitchoverMeasurement
*
* @brief check if the feature that decreases link prober interval to measure switch overhead is enabled or not
*
* @return if switch overhead measurement feature is enabled
*/
inline bool ifEnableSwitchoverMeasurement() {return mEnableSwitchoverMeasurement;};

private:
MuxConfig &mMuxConfig;
std::string mPortName;
Expand All @@ -300,6 +309,8 @@ class MuxPortConfig
uint16_t mServerId;
Mode mMode = Manual;
PortCableType mPortCableType;

bool mEnableSwitchoverMeasurement = false;
};

} /* namespace common */
Expand Down
4 changes: 3 additions & 1 deletion src/link_manager/LinkManagerStateMachineActiveStandby.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,9 @@ void ActiveStandbyStateMachine::switchMuxState(
mMuxStateMachine.setWaitStateCause(mux_state::WaitState::WaitStateCause::SwssUpdate);
mMuxPortPtr->postMetricsEvent(Metrics::SwitchingStart, label);
mMuxPortPtr->setMuxState(label);
mDecreaseIntervalFnPtr(mMuxPortConfig.getLinkWaitTimeout_msec());
if(mMuxPortConfig.ifEnableSwitchoverMeasurement()) {
mDecreaseIntervalFnPtr(mMuxPortConfig.getLinkWaitTimeout_msec());
}
mDeadlineTimer.cancel();
startMuxWaitTimer();
} else {
Expand Down