Skip to content
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.

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

[active-standby] Fix show mux status inconsistency introduced by orchagent rollback #225

Merged
merged 3 commits into from
Dec 13, 2023

Conversation

zjswhhh
Copy link
Contributor

@zjswhhh zjswhhh commented Dec 12, 2023

Description of PR

Summary:
Fixes # (issue)
This is to fix the show mux status inconsistency introduced by orchagent roll back.

In mux port state machine design, linkmgrd honors hardware state for active-standby ports, and never intends to trigger a secondary toggle when everything is healthy. But after we introduce orchagent rollback, show mux status can return unmatched APP_DB and STATE_DB entries for this, which blocks upgrade.

Hence, submitting this PR as a workaround.

sign-off: Jing Zhang [email protected]

Type of change

  • Bug fix
  • New feature
  • Doc/Design
  • Unit test

Approach

What is the motivation for this PR?

Work item tracking
  • Microsoft ADO (number only):
    26136887

How did you do it?

How did you verify/test it?

Any platform specific information?

Documentation

prsunny
prsunny previously approved these changes Dec 12, 2023
@zjswhhh zjswhhh marked this pull request as draft December 12, 2023 19:50
@lolyu lolyu merged commit 79c3872 into sonic-net:master Dec 13, 2023
8 checks passed
@prsunny
Copy link

prsunny commented Dec 13, 2023

@zjswhhh , would you raise a PR for 202205?

@zjswhhh zjswhhh deleted the orch_rb_master branch December 14, 2023 17:34
zjswhhh added a commit to zjswhhh/sonic-linkmgrd that referenced this pull request Dec 14, 2023
…chagent rollback (sonic-net#225)

Approach
What is the motivation for this PR?
This is to fix the show mux status inconsistency introduced by orchagent roll back.

In mux port state machine design, linkmgrd honors hardware state for active-standby ports, and never intends to trigger a secondary toggle when everything is healthy. But after we introduce orchagent rollback, show mux status can return unmatched APP_DB and STATE_DB entries for this, which blocks upgrade.

Hence, submitting this PR as a workaround.

sign-off: Jing Zhang [email protected]

Work item tracking
Microsoft ADO (number only):
26136887

How did you do it?
How did you verify/test it?
zjswhhh added a commit that referenced this pull request Dec 15, 2023
…chagent rollback (#225) (#226)

Approach
What is the motivation for this PR?
This is to fix the show mux status inconsistency introduced by orchagent roll back.

In mux port state machine design, linkmgrd honors hardware state for active-standby ports, and never intends to trigger a secondary toggle when everything is healthy. But after we introduce orchagent rollback, show mux status can return unmatched APP_DB and STATE_DB entries for this, which blocks upgrade.

Hence, submitting this PR as a workaround.

sign-off: Jing Zhang [email protected]

Work item tracking
Microsoft ADO (number only):
26136887

How did you do it?
How did you verify/test it?
@StormLiangMS
Copy link

@zjswhhh cherry pick conflict, could you help to raise separate PR for 202305?

zjswhhh added a commit to zjswhhh/sonic-linkmgrd that referenced this pull request Dec 18, 2023
…chagent rollback (sonic-net#225)

Approach
What is the motivation for this PR?
This is to fix the show mux status inconsistency introduced by orchagent roll back.

In mux port state machine design, linkmgrd honors hardware state for active-standby ports, and never intends to trigger a secondary toggle when everything is healthy. But after we introduce orchagent rollback, show mux status can return unmatched APP_DB and STATE_DB entries for this, which blocks upgrade.

Hence, submitting this PR as a workaround.

sign-off: Jing Zhang [email protected]

Work item tracking
Microsoft ADO (number only):
26136887

How did you do it?
How did you verify/test it?
StormLiangMS pushed a commit that referenced this pull request Dec 19, 2023
…ed by or… (#228)

…chagent rollback (#225)

Approach
What is the motivation for this PR?
This is to fix the show mux status inconsistency introduced by orchagent roll back.

In mux port state machine design, linkmgrd honors hardware state for active-standby ports, and never intends to trigger a secondary toggle when everything is healthy. But after we introduce orchagent rollback, show mux status can return unmatched APP_DB and STATE_DB entries for this, which blocks upgrade.

Hence, submitting this PR as a workaround.

sign-off: Jing Zhang [email protected]

Work item tracking
Microsoft ADO (number only):
26136887

How did you do it?
How did you verify/test it?
mssonicbld pushed a commit to mssonicbld/sonic-linkmgrd that referenced this pull request Feb 2, 2024
…chagent rollback (sonic-net#225)

Approach
What is the motivation for this PR?
This is to fix the show mux status inconsistency introduced by orchagent roll back.

In mux port state machine design, linkmgrd honors hardware state for active-standby ports, and never intends to trigger a secondary toggle when everything is healthy. But after we introduce orchagent rollback, show mux status can return unmatched APP_DB and STATE_DB entries for this, which blocks upgrade.

Hence, submitting this PR as a workaround.

sign-off: Jing Zhang [email protected]

Work item tracking
Microsoft ADO (number only):
26136887

How did you do it?
How did you verify/test it?
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202311: #243

mssonicbld pushed a commit that referenced this pull request Feb 2, 2024
…chagent rollback (#225)

Approach
What is the motivation for this PR?
This is to fix the show mux status inconsistency introduced by orchagent roll back.

In mux port state machine design, linkmgrd honors hardware state for active-standby ports, and never intends to trigger a secondary toggle when everything is healthy. But after we introduce orchagent rollback, show mux status can return unmatched APP_DB and STATE_DB entries for this, which blocks upgrade.

Hence, submitting this PR as a workaround.

sign-off: Jing Zhang [email protected]

Work item tracking
Microsoft ADO (number only):
26136887

How did you do it?
How did you verify/test it?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants