NAS-140229 / 25.10.2.2 / Call dlm.reset_active when peer disconnects (by bmeagherix)#18432
Merged
yocalebo merged 1 commit intorelease/25.10.2.2from Mar 11, 2026
Merged
Conversation
Previously reset_active was only called when STANDBY reconnected, leaving DLM RSBs in an inconsistent state for the duration of the outage. Calling it immediately when the peer goes down ensures DLM recovery runs and repairs pending lock lookups before SCST issues new dlm_lock requests during logout_all. Three guards prevent acting in the wrong context: only runs on MASTER; skips if the peer's DLM port is still reachable (middleware-only restart); skips if we have logged-in extents (we are STANDBY or mid-transition and the failover event is already handling cleanup). (cherry picked from commit 3398420)
bmeagherix
approved these changes
Mar 11, 2026
Contributor
Author
Contributor
Author
|
This PR has been merged and conversations have been locked. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously reset_active was only called when STANDBY reconnected, leaving DLM RSBs in an inconsistent state for the duration of the outage. Calling it immediately when the peer goes down ensures DLM recovery runs and repairs pending lock lookups before SCST issues new dlm_lock requests during logout_all.
Three guards prevent acting in the wrong context: only runs on MASTER; skips if the peer's DLM port is still reachable (middleware-only restart); skips if we have logged-in extents (we are STANDBY or mid-transition and the failover event is already handling cleanup).
Original PR: #18423