Skip to content

Adopt orphaned R1 streams/consumers on standalone-to-cluster promotion #7988

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
tilakraj94 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Adopt orphaned R1 streams/consumers on standalone-to-cluster promotion #7988

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d30f2b
Adopt orphaned R1 streams on standalone-to-cluster promotion
tilakraj94 Mar 27, 2026
b9939b8
add pendingAdoptions
tilakraj94 Mar 27, 2026
a8973f9
add stopAndClearTimer
tilakraj94 Mar 29, 2026
67c639b
add hasLocalStreams check
tilakraj94 Mar 30, 2026
6de33c3
remove continue
tilakraj94 Mar 30, 2026
6f78861
change warn to fatal
tilakraj94 Mar 30, 2026
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
3 changes: 3 additions & 0 deletions server/jetstream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,9 @@ func (s *Server) shutdownJetStream() {
qch, stopped = cc.qch, cc.stopped
cc.qch, cc.stopped = nil, nil
}
// Cancel any pending checkForOrphans timer so it cannot fire on a
// server that is already shutting down.
stopAndClearTimer(&cc.orphanTimer)
js.stopUpdatesSub()
if cc.c != nil {
cc.c.closeConnection(ClientClosed)
Expand Down
Loading