Adopt orphaned R1 streams/consumers on standalone-to-cluster promotion#7988
Adopt orphaned R1 streams/consumers on standalone-to-cluster promotion#7988tilakraj94 wants to merge 6 commits intonats-io:mainfrom
Conversation
tilakraj94
force-pushed
the
orphanstreams
branch
from
a8f2064 to
690a0e7
Compare
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: a8f20645ea
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
tilakraj94
force-pushed
the
orphanstreams
branch
3 times, most recently
from
35ac5a3 to
4b046f3
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 4b046f383a
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
tilakraj94
force-pushed
the
orphanstreams
branch
from
4b046f3 to
68b03ad
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 68b03ad547
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
tilakraj94
force-pushed
the
orphanstreams
branch
from
68b03ad to
91efd2a
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 91efd2a9cd
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
tilakraj94
force-pushed
the
orphanstreams
branch
from
91efd2a to
13aa5d1
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 13aa5d1c7c
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
tilakraj94
force-pushed
the
orphanstreams
branch
from
13aa5d1 to
40e2729
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 40e272965c
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 40e272965c
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
tilakraj94
force-pushed
the
orphanstreams
branch
2 times, most recently
from
59ba394 to
ded0937
Compare
|
@claude re-review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b52c0d5806
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
tilakraj94
force-pushed
the
orphanstreams
branch
2 times, most recently
from
adaa78d to
1bdfed9
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1bdfed981f
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
tilakraj94
force-pushed
the
orphanstreams
branch
from
1bdfed9 to
cbec119
Compare
tilakraj94
changed the title
tilakraj94
force-pushed
the
orphanstreams
branch
2 times, most recently
from
33671bb to
62f9b68
Compare
Signed-off-by: Tilak Raj <tilak.raj94@gmail.com>
tilakraj94
force-pushed
the
orphanstreams
branch
from
62f9b68 to
0d30f2b
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 0d30f2b31c
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Signed-off-by: Tilak Raj <tilak.raj94@gmail.com>
tilakraj94
force-pushed
the
orphanstreams
branch
from
38ce856 to
b9939b8
Compare
Signed-off-by: Tilak Raj <tilak.raj94@gmail.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: a8973f92fe
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Signed-off-by: Tilak Raj <tilak.raj94@gmail.com>
tilakraj94
force-pushed
the
orphanstreams
branch
from
11c47fd to
67c639b
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 67c639bead
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Signed-off-by: Tilak Raj <tilak.raj94@gmail.com>
tilakraj94
force-pushed
the
orphanstreams
branch
from
af8c6d9 to
6de33c3
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 6de33c3a49
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Signed-off-by: Tilak Raj <tilak.raj94@gmail.com>
1 participant
When a standalone JetStream server joins a cluster for the first time, any R1 streams and their durable consumers that exist on disk become orphans , the cluster's meta layer has no record of them. This change detects and adopts those streams automatically, so operators can promote a standalone server to cluster without losing data.
What it does
On first cluster join, the server scans for R1 streams on disk that have no corresponding cluster assignment and proposes them to the meta leader for adoption. Durable consumers are adopted alongside their stream.
If a local stream's name conflicts with a stream already present in the cluster, the local copy is stopped in memory and preserved on disk. The cluster stream takes precedence. The operator can rename the local copy and it will be adopted on the next restart.
A small marker file is written to the Raft meta directory on bootstrap and removed once all adoption and conflict resolution is complete. This makes the process crash-safe: if the server restarts mid-adoption, the marker is found and the work resumes.
Tests
basic promotion, adoption from a non-leader node, duplicate stream name conflict and data preservation, marker lifecycle, on-disk stream rename before promotion, consumer ack-state survival, multiple streams adopted in one pass, mixed adoption and conflict in the same promotion, ephemeral consumers not adopted, conflict resolved after rename, and post-adoption replica scale-up.
Apart from automated tests, this has also been validated through manual testing.
Ref : #7831
Signed-off-by: Tilak Raj tilak.raj94@gmail.com